]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'uhid' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 24 Jul 2012 11:40:06 +0000 (13:40 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 24 Jul 2012 11:40:06 +0000 (13:40 +0200)
commitdad3ccce9a4e8e6c1ef7abba9bc2554b9c90d5d4
treedfd376034ea8458689c937dafa5e318892af82af
parent81324b5d3d10ca5fa5a8ef3341dbe33fff7b77fe
parent378dc460f0ccda3430cf8a798d99803a346b1e5e
Merge branch 'uhid' into for-linus

Conflicts:
drivers/hid/Kconfig
MAINTAINERS
drivers/hid/Kconfig
drivers/hid/Makefile
include/linux/Kbuild