]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branches 'for-3.11/wacom-fixed' and 'for-3.11/wiimote' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Thu, 4 Jul 2013 13:05:02 +0000 (15:05 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 4 Jul 2013 13:05:02 +0000 (15:05 +0200)
1  2  3 
drivers/hid/Kconfig
drivers/hid/Makefile

Simple merge
Simple merge