Jiri Kosina ad295b6d57 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		2014-04-01 19:05:09 +02:00
..
i2c-hid.c	Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-linus	2014-04-01 19:05:09 +02:00
Kconfig	HID: i2c-hid: enhance Kconfig	2012-12-05 10:55:03 +01:00
Makefile