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