Merge branch 'for-linus2' of git://git.kernel.dk/linux-2.6-block