projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9929ffe 7d3d42a)
Merge branch 'acrux' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:29:35 +0000 (15:29 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:29:35 +0000 (15:29 +0200)
Conflicts:
drivers/hid/hid-ids.h

1  2 
drivers/hid/Kconfig patch | diff1 | diff2 | blob | history
drivers/hid/Makefile patch | diff1 | diff2 | blob | history
drivers/hid/hid-core.c patch | diff1 | diff2 | blob | history
drivers/hid/hid-ids.h patch | diff1 | diff2 | blob | history

diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/Makefile
Simple merge
diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.