From: Linus Torvalds 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: v2.6.37-rc7~28 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/9fe4145530e6072cc838beb95ca68cada8c56909 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) --- 9fe4145530e6072cc838beb95ca68cada8c56909