Linux 3.12-rc6
Merge commit '31d141e3a666269a3b6fcccddb0351caf7454240'