]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:27:54 +0000 (15:27 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:27:54 +0000 (15:27 +0200)
commit00220687297983f408211243e50605c33cf81e85
tree3cca02ae6b6616cc9a204b762aab349fcfa3aefe
parentabc4d2498943a6f09c382bbf25b7cc3d166ddfdd
parent72cb5400c118aa891df4045a26f08206070bcfcd
Merge branch 'upstream-fixes' into for-linus

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