Merge branch 'linus' of ../linux-2.6 into master-2.6.38