Drivers changes

Conflicts:
	drivers/input/keyboard/gpio_keys.c
	drivers/input/touchscreen/mxts.c
	drivers/media/common/tuners/xc4000.c