Merge remote-tracking branch 'git@github.com:dvhexer/lge-kernel-mako.git jellybean' into HEAD

Conflicts:
	drivers/input/touchscreen/lge_touch_core.c

Change-Id: I0a1ebf9927def5e7429459a001ca8a170710113f

Conflicts:

	arch/arm/mach-msm/lge/devices_lge.c
	arch/arm/mach-msm/lge/mako/board-mako-display.c
	drivers/input/touchscreen/lge_touch_core.c