projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0c3844 ab4e019)
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)
* '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)


Trivial merge
John Crispins staging tree