Merge branch 'for-linus' of git://github.com/schandinat/linux-2.6