Linux 3.12-rc3
Merge remote-tracking branch: upstream/master