tree dc7df27c0eb69d50f8a9971dca0b96f405538553
parent 999fd1ab344dabd9c985b638bf4c29495b8e4619
parent 3a4b4aaa546fa3d57b2ea7f41234f7d2e328da3f
author Linus Torvalds <torvalds@linux-foundation.org> 1275691350 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1275691350 -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: wacom - add Cintiq 21UX2 and Intuos4 WL
  Input: ads7846 - fix compiler warning in ads7846_probe()
  Input: tps6507x-ts - a couple work queue cleanups
  Input: s3c2410_ts - tone down logging
  Input: s3c2410_ts - fix build error due to ADC Kconfig rename