summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-16 19:43:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-16 19:43:30 -0700
commit8665ffc9215be1fe56f97500dad0440c9b644f5c (patch)
treec1692b1df3b43733d2d6416b39b34ab15ba7eaba /Makefile
parentb4cbb197c7e7a68dbad0d491242e3ca67420c13e (diff)
parent202dec868a769af726e262790bf00b09ec929b52 (diff)
downloadlinux-8665ffc9215be1fe56f97500dad0440c9b644f5c.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov: "Two small fixups to the Wacom driver" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: wacom - correct reported resolution for Intuos4 Wireless Input: wacom - fix "can not retrieve extra class descriptor" for 24HDT
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions