]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.12/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Sep 2013 10:13:35 +0000 (12:13 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Sep 2013 10:13:35 +0000 (12:13 +0200)
1  2 
include/linux/hid.h

Simple merge