Jiri Kosina af5666e0f7 Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus ...

Conflicts:
	drivers/hid/hid-sensor-hub.c

2014-06-04 13:09:01 +02:00

35 KiB

Raw Blame History

View Raw