Merge Linux 3.4.12