Merge branch 'for-upstream' of git://github.com/agraf/linux-2.6 into next