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