Merge branches 'roccat' and 'wacom' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 20 Mar 2012 12:05:18 +0000 (13:05 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 20 Mar 2012 12:05:18 +0000 (13:05 +0100)
1  2  3 
drivers/hid/Kconfig

Simple merge