tree 3c96bdc26687e0f6958e790c8c93c0c6efb6b8d6
parent fdf91dae6f024c6dfee425fe754df6b1957f6c53
parent 31d141e3a666269a3b6fcccddb0351caf7454240
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1382212967 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1382212967 -0700

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>