Jiri Kosina 539cf54bdd Merge branches 'for-3.8/upstream-fixes', 'for-3.9/hid-sensor', 'for-3.9/hidraw' and 'for-3.9/i2c-hid' into for-linus ... Conflicts: drivers/hid/i2c-hid/i2c-hid.c		2013-02-21 10:42:39 +01:00
..
Kconfig	HID: i2c-hid: enhance Kconfig	2012-12-05 10:55:03 +01:00
Makefile	…
i2c-hid.c	Merge branches 'for-3.8/upstream-fixes', 'for-3.9/hid-sensor', 'for-3.9/hidraw' and 'for-3.9/i2c-hid' into for-linus	2013-02-21 10:42:39 +01:00