Merge branch 'upstream' into for-linus

Browse source

Conflicts:
	drivers/hid/hid-wacom.c

...

This commit is contained in:

Jiri Kosina 2010-05-19 14:04:49 +02:00

parent 537b60d178 a8ab5d58b0

commit 7426ef52b4

16 changed files with 679 additions and 79 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

2

include/linux/hid.h

View file