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)
commitc062c4d1de57789bf15f7641a24c429eeb8a1c6a
treedfd376034ea8458689c937dafa5e318892af82af
parent929bd380b7aec9f9553b6509af86cdba25e334b8
parentadefb69b1b94df29ea2df05cd838c0e032b2c473
Merge branch 'uhid' into for-linus

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