Merge branch 'linux-3.6'