tree 3491452ea74b039f3278fd95bb7ad7c88b6b3631
parent ba6857b2d49646f2d4c245ff58d95d145f380177
parent 31d141e3a666269a3b6fcccddb0351caf7454240
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1382213138 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1382213138 -0700

Merge 3.12-rc6 into driver-core-next

We want these fixes here too.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>