summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-05 09:22:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-05 09:22:38 -0700
commit538d2882213ef4f076108f3edda2c39a584c4c2b (patch)
tree130e954abe7c63a49b7a99fcac1dfacb5c5edc1d /Makefile
parent71277a6635890ab401f0a9dd7d5d9e652eea44ef (diff)
parentd6069dae4700cf5290a75002c46b9be8ea7eef3c (diff)
downloadlinux-2.6-master.tar.gz
linux-2.6-master.tar.xz
Merge branch 'for-linus' of git://github.com/dtor/inputHEADmaster
* 'for-linus' of git://github.com/dtor/input: Input: wacom - revert "Cintiq 21UX2 does not have menu strips"
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions