This picks up the big printk fixes, and resolves a merge issue with:
	drivers/extcon/extcon_gpio.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>