Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat' into...
authorJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:47:38 +0000 (22:47 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:47:38 +0000 (22:47 +0200)
commitbbd128b5acae85b2ef346e95cc5a729ac5252f19
tree757943342e24dbb793ac99e74b1b7e2d7be10dc6
parentc3d9d74336c10c133ed062a1d778d457c6a46422
parent48216fbdad6cc462b056ce1e876edcc664d32a8d
parentf51661105c3c8a0afcd69f995a4f4a10e53da153
parent2c6118e43040034d80894daeba41960bf0035b31
parent921990b7046ab4fb523cbccc5bce2c921762232d
parent0277873c05158c5efc97c23d52e6aec6250bde0f
parentd2b570a5d451487f0c5026ea6113842b2eed4894
Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat' into for-linus
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/usbhid/hid-core.c
drivers/hid/usbhid/hid-quirks.c