tree e3d511aca536b7123d256b98a0ef8e74fc219498
parent a7761027656dc192b59617a6eb961e38097419ce
parent 41ef2d5678d83af030125550329b6ae8b74618fa
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1365988895 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1365988895 -0700

Merge 3.9-rc7 into char-misc-next

We want the fixes in there.

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