tree b0f75a9353f2e9a82c6839a4f507eeb40ffc5fc5
parent ad9ddd66c6e8a79630a975ff0bb8d45a11abe630
parent 230ffc8e348e7841b79fd7c659d16aa5d7ec8a69
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1179933103 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1179933103 -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: ads7846 - SPI_CPHA mode bugfix
  Input: ads7846 - document that it handles tsc2046 too
  Input: input-polldev - add module info
  Input: ucb1x00-ts - remove commented out code
  Input: ucb1400_ts - use sched_setscheduler()
  Input: ALPS - force stream mode
  Input: iforce - minor clean-ups
  Input: iforce - fix force feedback not working
  Input: adbhid - do not access input_dev->private directly
  Input: logips2pp - add type 72 (PS/2 TrackMan Marble)