Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for...
authorJiri Kosina <jkosina@suse.cz>
Wed, 12 Dec 2012 20:41:55 +0000 (21:41 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 12 Dec 2012 20:41:55 +0000 (21:41 +0100)
commit818b930bc15077fc00ff16bb22c5df1857f05afa
treed799c1037eb55e5f8bdecf72d5fdd45ab4f57569
parentf9af7b9edccb87d4d80b58687ab63e58f3b64c4c
parentb5531318f18b5054c0e4a82beb560a77d85948d8
parent7a7d6d9c5fcd4b674da38e814cfc0724c67731b2
parent1b42fc4a2889729c740321eb487f887161e38428
parent955dca354c3c02850409e773fcbd625ac68dd5e7
parent68fd32b8228a62ca7f46ed64da8267daad29480b
parent4529eefad087f97b33c0f31984d924b1f15d7bae
Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for-3.8/multitouch', 'for-3.8/roccat', 'for-3.8/sensors' and 'for-3.8/upstream' into for-linus

Conflicts:
drivers/hid/hid-core.c
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-apple.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/hid-sensor-hub.c
drivers/hid/usbhid/hid-quirks.c
include/linux/hid.h