Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6