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
treeff6e16818194aca66d8ea34f9765067b2a82020a
parentbbd128b5acae85b2ef346e95cc5a729ac5252f19
parent41fa92302be7fa37c5c38e17e2097d3e5e9da13a
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