]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 27 Aug 2012 15:06:40 +0000 (08:06 -0700)
committerJiri Kosina <jkosina@suse.cz>
Mon, 27 Aug 2012 15:06:40 +0000 (08:06 -0700)
1  2 
MAINTAINERS
drivers/hid/hid-ids.h

diff --cc MAINTAINERS
Simple merge
Simple merge