tree da40601977dacba29f3fcbd87425f0c5c759906b
parent 4c1cc40a2d49500d84038ff751bc6cd183e729b5
parent 5cf0eb9875cb26ebdc60d08444272b2ea219386e
author Linus Torvalds <torvalds@linux-foundation.org> 1385318729 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1385318729 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov:
 "A new driver for Surface 2.0/Pixelsense touchscreen and a couple of
  driver fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  MAINTAINERS - add keyboard driver to Hyper-V file list
  Input: atmel-wm97xx - fix compile error
  Input: hp_sdc_rtc - unlock on error in hp_sdc_rtc_read_i8042timer()
  Input: cyttsp4 -  remove unnecessary work pending test
  Input: add sur40 driver for Samsung SUR40 (aka MS Surface 2.0/Pixelsense)