Merge branches 'for-3.13/upstream-fixes', 'for-3.14/i2c-hid', 'for-3.14/sensor-hub...
authorJiri Kosina <jkosina@suse.cz>
Wed, 22 Jan 2014 14:40:14 +0000 (15:40 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 22 Jan 2014 14:40:14 +0000 (15:40 +0100)
commit62813858fb5d1fb661433d7884668aa111115a35
tree2ad585653cbbd2a8776a6634733193819ea4b9fa
parentb2b98ea87a8d82d1100200324ace989970a92423
parent94037efe81d8e734e28f12b98f76a6e8005495d6
parent875e36f8a2ce6cfc2010af6c91fb5351bd530d48
parent61ebca937f2609e66fe6749f8f5df57ff387e2eb
parent274be3eb653c421d68514684024c6d915c94b728
Merge branches 'for-3.13/upstream-fixes', 'for-3.14/i2c-hid', 'for-3.14/sensor-hub', 'for-3.14/sony' and 'for-3.14/upstream' into for-linus
drivers/hid/Kconfig
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-multitouch.c
drivers/hid/i2c-hid/i2c-hid.c