Jiri Kosina 047dff63f9 Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into for-linus ...

Conflicts:
	drivers/hid/Kconfig

2013-04-30 10:19:07 +02:00

9.7 KiB

Raw Blame History

View Raw