Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6