This is a combination of 4 commits.
 The first commit's message is:
update himax8526a
use protocol B
update logging

 This is the 2nd commit message:

forgot to change the name back to original
this is to allow touch keys to work, as htc has used a stupid method to call the keys

 This is the 3rd commit message:

remove the htc events from himax

 This is the 4th commit message:

cleanup an unused variable

Change-Id: I8db173050b0e0d02d590885c6a55199dae926747
This is a combination of 2 commits.
 The first commit's message is:

Bring in Sweep2Wake on himax touch sensor
This is a very basic implementation. you can't configure it from outside the kernel yet

 This is the 2nd commit message:

himax: s2w: add a sysfs attribute to enable the user to toggle on or off
enabled by default
to use: su -c 'echo 0 > /sys/android_touch/s2wswitch'
Add backlight notification support for Pico & 3.4 lowmemorykiller fix

Conflicts:
	arch/arm/configs/pico_defconfig
	drivers/misc/Kconfig
	drivers/misc/Makefile
staging: android: Update from Grouper

Conflicts:
	drivers/staging/android/Kconfig
	drivers/staging/android/binder.c
	drivers/staging/android/logger.c
	drivers/staging/android/logger.h
	drivers/staging/android/lowmemorykiller.c
	drivers/staging/android/timed_gpio.c
	drivers/staging/android/timed_gpio.h