summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-04-30 10:17:48 +0200
committerJiri Kosina <jkosina@suse.cz>2013-04-30 10:17:48 +0200
commit72c16d9a5c303dce928a52a8861fe7a2a25f849a (patch)
treeb38d03007abcfadf12619d422169a6d4d4000ce7 /README
parentMerge branches 'for-3.10/appleir', 'for-3.10/hid-debug', 'for-3.10/hid-driver... (diff)
parentHID: multitouch: force BTN_STYLUS for pen devices (diff)
downloadlinux-72c16d9a5c303dce928a52a8861fe7a2a25f849a.tar.xz
linux-72c16d9a5c303dce928a52a8861fe7a2a25f849a.zip
Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus
Conflicts: drivers/hid/hid-multitouch.c
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions