This picks up the printk fixes in 3.6-rc3 that are needed in this branch.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>