Merge branch 'upstream-2.6.17'