tree 6988fa3734adb98ab989657c56b7e31e94e723f8
parent 3988ba0708e98b4bafc9034aa476775520bee708
parent 72d18a7b9e1a3a9511bae78fc7f0932ae01d5d73
author Linus Torvalds <torvalds@linux-foundation.org> 1217264366 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217264366 -0700

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: add driver for Atmel integrated touchscreen controller
  Input: ads7846 - optimize order of calculating Rt in ads7846_rx()
  Input: ads7846 - fix sparse endian warnings
  Input: uinput - remove duplicate include
  Input: serio - offload resume to kseriod
  Input: serio - mark serio_register_driver() __must_check