Merge branch 'master' of ../linux-2.6/