Linux 3.0.85
Touch to wake: Different infinite mode handling
- if touch wake delay is set to 0 (infinite mode), the power button will
  now also disable touch to wake (like it is for normal delays)
X-Box gamepad support
Merge branch 'test' of github.com:temasek/android_kernel_samsung_smdk4412 into no-abb