Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Jun 2014 11:09:01 +0000 (13:09 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Jun 2014 11:09:01 +0000 (13:09 +0200)
commitaf5666e0f76023d9c296016024297903a4c83108
tree9397e7a41dd3eb0c0e14a6407a8e8f12abed4fc5
parent1b15d2e5b8077670b1e6a33250a0d9577efff4a5
parent368c96640d10a145da5f258f2d2833668d4f3629
Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus

Conflicts:
drivers/hid/hid-sensor-hub.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-sensor-hub.c
drivers/hid/usbhid/hid-quirks.c