Merge branch 'kernelorg/linux-3.4.y'