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

..

proc-sys-vm-nr_pdflush_threads

…

sysfs-bus-usb

…

sysfs-class-rfkill

…

sysfs-driver-hid-roccat-koneplus

…

sysfs-driver-hid-roccat-kovaplus

…

sysfs-driver-hid-roccat-pyra

…