Merge Linux 3.4.11
Merge Linux 3.4.12