Merge branches 'for-3.10/appleir', 'for-3.10/hid-debug', 'for-3.10/hid-driver-transpo...
authorJiri Kosina <jkosina@suse.cz>
Tue, 30 Apr 2013 08:12:44 +0000 (10:12 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 30 Apr 2013 08:12:44 +0000 (10:12 +0200)
commit4f5a81042909fed6977881f22c024aa3582cfcca
treee4988527cfb63d13a40fe235c8aa399a4931c049
parent9a4a5574ce427c364d81746fc7fb82d86b5f1a7e
parent2353f2bea307390e015493118e425152b8a5a431
parent7c4d577367fb710ea74a56955c5e3546fe5dd7ac
parentd991938a807a63c58c9c0fa6cd05cd2490aa6993
Merge branches 'for-3.10/appleir', 'for-3.10/hid-debug', 'for-3.10/hid-driver-transport-cleanups', 'for-3.10/i2c-hid' and 'for-3.10/logitech' into for-linus
drivers/hid/Kconfig
drivers/hid/hid-apple.c
drivers/hid/hid-core.c
drivers/hid/hid-lg4ff.c
drivers/hid/hid-logitech-dj.c
drivers/hid/hid-magicmouse.c
drivers/hid/hid-multitouch.c
include/linux/hid.h