]> git.proxmox.com Git - mirror_ubuntu-artful-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)
commitad295b6d5739ab24880a31be403bbc8fab62e177
treecd760a18bcfa6e59b8b63fc71e333ba394b1cd9c
parentba04a57b4acd05a764471b2accd02000f6641881
parentc3d77fab51f40821de91a744e4b514e9e4e76a7c
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