Merge with /shiny/git/linux-2.6/.git