]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit4dbf2893fa764329abe315890596112765cbde56
tree08e2ff6c3cb90193677e67b1f23b85d1ba775f74
parentb3c13f99c7fd8f7464fe00c240bb704264c134bc
parentc6ce8b68c5430ac4796d6756487b5b2c05cdb8d2
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