Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc