Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 23 May 2011 10:49:25 +0000 (12:49 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 23 May 2011 10:49:25 +0000 (12:49 +0200)
commit366a2382c68d01638350efcf23d46a47d661c595
treec45852727ce4ff7006fc080b95aaf0f6144d2a75
parentd431b2e33cd54e4334019a95979ae93aea4735e8
parent22408283bca57780bdd53da5a6e4474b71b94430
parent6cb4b040795c555c7ab4b1ba29b0dba2b5a42beb
parent23746a66d7d9e73402c68ef00d708796b97ebd72
Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus
drivers/hid/Kconfig
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-lgff.c
drivers/hid/hid-magicmouse.c
drivers/hid/usbhid/hid-quirks.c
drivers/hid/usbhid/hiddev.c
samples/Kconfig