]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:26:15 +0000 (15:26 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:26:15 +0000 (15:26 +0200)
commitabc4d2498943a6f09c382bbf25b7cc3d166ddfdd
tree326d5f84b13938a12fb27468ef73db4faf43a44e
parent61e6e5012b10fc1e46e9511d53195ba0f7343cfb
parent1bba727e01cd1cb06dbcbbfdd64b2a172e43b4b1
Merge branch 'upstream' into for-linus

Conflicts:
drivers/hid/hid-ids.h
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h