Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Dec 2010 16:33:44 +0000 (08:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Dec 2010 16:33:44 +0000 (08:33 -0800)
commit9fe4145530e6072cc838beb95ca68cada8c56909
tree72d0c2d45bb92e75f3a0b4e102fbee2904dea4c0
parentb0c3844d8af6b9f3f18f31e1b0502fbefa2166be
parentab4e0192196b8d4e43a3945742d4996da934a86f
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: define separate EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2
  Input: wacom - add another Bamboo Pen ID (0xd4)