Merge branch 'linux-2.6' into for-2.6.22