| commit | f934fb19ef34730263e6afc01e8ec27a8a71470f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 28 09:59:26 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 28 09:59:26 2008 -0700 |
| tree | 6988fa3734adb98ab989657c56b7e31e94e723f8 | |
| parent | 3988ba0708e98b4bafc9034aa476775520bee708 [diff] | |
| parent | 72d18a7b9e1a3a9511bae78fc7f0932ae01d5d73 [diff] |
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