tree 71b1f928dec412b4210f12fac92de593df54fedc
parent 77933c354c6c0e4b6abcb417518e84b8fd9b7ae4
parent ab3f4980ec62b907e697ff0934a8e1d076a6d46d
parent aeacb6fd30c800e8229905eac7023777a472d772
parent 95736de984dec5b80ea9d6640d4d55ca8ff98db4
parent 1f749d8d5f92c275e35cdcd1fdcb7c8298157118
author Jiri Kosina <jkosina@suse.cz> 1274272028 +0200
committer Jiri Kosina <jkosina@suse.cz> 1274272028 +0200

Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus

Conflicts:
	drivers/hid/Makefile