projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f5a810 fb4d8d9)
Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 30 Apr 2013 08:17:48 +0000 (10:17 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 30 Apr 2013 08:17:48 +0000 (10:17 +0200)
Conflicts:
drivers/hid/hid-multitouch.c

1  2 
drivers/hid/hid-multitouch.c patch | diff1 | diff2 | blob | history
include/linux/hid.h patch | diff1 | diff2 | blob | history

diff --cc drivers/hid/hid-multitouch.c
Simple merge
diff --cc include/linux/hid.h
Simple merge
Domain: System / Kernel;