]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 17:05:09 +0000 (19:05 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 17:05:09 +0000 (19:05 +0200)
commitd42c616addcd247037e0fc4e9e5d4e22bfaca582
treecd760a18bcfa6e59b8b63fc71e333ba394b1cd9c
parent8d73080cf5faa7a5dabc45061e87bc39d7cce212
parenta7db01b2533ffb2344cf5dfcbdca4b0d5491069f
Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-linus

Conflicts:
drivers/hid/hid-ids.h
drivers/hid/hid-sony.c
drivers/hid/i2c-hid/i2c-hid.c
drivers/hid/hid-core.c
drivers/hid/hid-hyperv.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/hid-sony.c
drivers/hid/hidraw.c
drivers/hid/i2c-hid/i2c-hid.c
net/bluetooth/hidp/core.c