From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Jun 2010 22:42:30 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v3.0~4399
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8ce655e737dc395e115ecdce143a43b9b6127f46;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'for-linus' of git://git./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
---

8ce655e737dc395e115ecdce143a43b9b6127f46