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