Merge branch 'upstream-fixes' into for-next
authorJiri Kosina <jkosina@suse.cz>
Sun, 4 Jan 2009 00:04:09 +0000 (01:04 +0100)
committerJiri Kosina <jkosina@suse.cz>
Sun, 4 Jan 2009 00:04:09 +0000 (01:04 +0100)
Conflicts:

drivers/hid/hid-ids.h


Trivial merge