Merge branch '2.6.36-fixes' of git://github.com/schandinat/linux-2.6