Merge branch 'for-3.15/microsoft' into for-linus

Browse source

Conflicts:
	drivers/hid/hid-core.c

...

This commit is contained in:

Jiri Kosina 2014-04-01 19:06:41 +02:00

parent ded75664d1 34e75dca4e

commit 6cf8c85f8b

4 changed files with 75 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/hid/hid-core.c

View file

1

drivers/hid/hid-ids.h

View file

3

drivers/hid/hid-input.c

View file

74

drivers/hid/hid-microsoft.c

View file