projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bbd128b 41fa923)
Merge branch 'uc-logic' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:49:32 +0000 (22:49 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:49:32 +0000 (22:49 +0200)
commit8b66a16f25f819bb1f132f075c5c01a288776cf8
treeff6e16818194aca66d8ea34f9765067b2a82020atree | snapshot
parentbbd128b5acae85b2ef346e95cc5a729ac5252f19commit | diff
parent41fa92302be7fa37c5c38e17e2097d3e5e9da13acommit | diff
Merge branch 'uc-logic' into for-linus

Conflicts:
drivers/hid/hid-ids.h
drivers/hid/hid-lg.c
drivers/hid/usbhid/hid-quirks.c
drivers/hid/Kconfig diff1 | diff2 | blob | history
drivers/hid/Makefile diff1 | diff2 | blob | history
drivers/hid/hid-core.c diff1 | diff2 | blob | history
drivers/hid/hid-ids.h diff1 | diff2 | blob | history
drivers/hid/hid-input.c diff1 | diff2 | blob | history
drivers/hid/hid-lg.c diff1 | diff2 | blob | history
drivers/hid/hid-sony.c diff1 | diff2 | blob | history
drivers/hid/usbhid/hid-quirks.c diff1 | diff2 | blob | history
include/linux/hid.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.