Jiri Kosina 818b930bc1 Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for-3.8/multitouch', 'for-3.8/roccat', 'for-3.8/sensors' and 'for-3.8/upstream' into for-linus ... Conflicts: drivers/hid/hid-core.c		2012-12-12 21:41:55 +01:00
..
core.c	HID: hidp: fallback to input session properly if hid is blacklisted	2012-12-07 11:12:27 +01:00
hidp.h	Bluetooth: Fix hidp disconnect deadlocks and lost wakeup	2011-06-30 15:47:50 -03:00
Kconfig	HID: Fix the generic Kconfig options	2012-06-25 17:25:00 +02:00
Makefile
sock.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00