tree 72d0c2d45bb92e75f3a0b4e102fbee2904dea4c0
parent b0c3844d8af6b9f3f18f31e1b0502fbefa2166be
parent ab4e0192196b8d4e43a3945742d4996da934a86f
author Linus Torvalds <torvalds@linux-foundation.org> 1292517224 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1292517224 -0800

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: define separate EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2
  Input: wacom - add another Bamboo Pen ID (0xd4)