summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-05-19 16:27:08 +0400
committerJiri Kosina <jkosina@suse.cz>2010-05-19 16:27:08 +0400
commit36dbe2fc5534291d261a4c63033232aa2f60c2a9 (patch)
tree71b1f928dec412b4210f12fac92de593df54fedc /drivers/hid
parent77933c354c6c0e4b6abcb417518e84b8fd9b7ae4 (diff)
parentab3f4980ec62b907e697ff0934a8e1d076a6d46d (diff)
parentaeacb6fd30c800e8229905eac7023777a472d772 (diff)
parent95736de984dec5b80ea9d6640d4d55ca8ff98db4 (diff)
parent1f749d8d5f92c275e35cdcd1fdcb7c8298157118 (diff)
downloadlinux-36dbe2fc5534291d261a4c63033232aa2f60c2a9.tar.xz
Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus
Conflicts: drivers/hid/Makefile