]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.3/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 10 Aug 2015 12:26:20 +0000 (14:26 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 10 Aug 2015 12:26:20 +0000 (14:26 +0200)

Trivial merge