]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitcb8ad140e23ad806f6476525990cee4e497d10bb
treeff6e16818194aca66d8ea34f9765067b2a82020a
parentd335dc80fbb91f51b6e26cb8a73891439f0b4692
parentfd43668c0fe12819d92126fd10d0988fd4b05948
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
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/hid-lg.c
drivers/hid/hid-sony.c
drivers/hid/usbhid/hid-quirks.c
include/linux/hid.h