Merge 3.12-rc6 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 19 Oct 2013 20:02:47 +0000 (13:02 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 19 Oct 2013 20:02:47 +0000 (13:02 -0700)
commitdfc568e6bc08916f1035af456e4631c47166b5cf
tree3c96bdc26687e0f6958e790c8c93c0c6efb6b8d6
parentfdf91dae6f024c6dfee425fe754df6b1957f6c53
parent31d141e3a666269a3b6fcccddb0351caf7454240
Merge 3.12-rc6 into char-misc-next

We want the fixes in here as well.

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