tree 9c2c67433a2783f29fe1f99cf44380b4fbb725af
parent 5ed0505c713805f89473cdc0bbfb5110dfd840cb
parent 07961ac7c0ee8b546658717034fe692fd12eefa9
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1364838658 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1364838658 -0700

Merge v3.9-rc5 into char-misc-next

This picks up the fixes in 3.9-rc5 that we need here.

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