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

Conflicts:

drivers/hid/hid-ids.h
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hidraw.c