Merge branch 'waltop' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:54:53 +0000 (22:54 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:54:53 +0000 (22:54 +0200)
commitf1275410a108ac38b59149d10bce3f35edd70876
treee86e0bab91fd1c2faa678b2c2c8442019bf4f92a
parent8b66a16f25f819bb1f132f075c5c01a288776cf8
parent00e7f9649b3061281fe4b463263da26155dc9be4
Merge branch 'waltop' into for-linus
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/usbhid/hid-quirks.c