Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 19 May 2010 12:27:08 +0000 (14:27 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 19 May 2010 12:27:08 +0000 (14:27 +0200)
commit36dbe2fc5534291d261a4c63033232aa2f60c2a9
tree71b1f928dec412b4210f12fac92de593df54fedc
parent77933c354c6c0e4b6abcb417518e84b8fd9b7ae4
parentab3f4980ec62b907e697ff0934a8e1d076a6d46d
parentaeacb6fd30c800e8229905eac7023777a472d772
parent95736de984dec5b80ea9d6640d4d55ca8ff98db4
parent1f749d8d5f92c275e35cdcd1fdcb7c8298157118
Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus

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