little more fixes

Conflicts:
	drivers/input/touchscreen/himax8526a.c
flick2wake

Conflicts:
	drivers/input/touchscreen/himax8526a.c
Hopefully more stable S2W