From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Dec 2010 16:33:44 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: firefly_0821_release~7613^2~3233
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9fe4145530e6072cc838beb95ca68cada8c56909;p=firefly-linux-kernel-4.4.55.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: define separate EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2
  Input: wacom - add another Bamboo Pen ID (0xd4)
---

9fe4145530e6072cc838beb95ca68cada8c56909