Jiri Kosina 8b66a16f25 Merge branch 'uc-logic' into for-linus ...

Conflicts:
	drivers/hid/hid-ids.h
	drivers/hid/hid-lg.c
	drivers/hid/usbhid/hid-quirks.c

2010-10-23 22:49:32 +02:00

25 KiB

Raw Blame History

View Raw