]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.2/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 18 Jun 2015 09:01:31 +0000 (11:01 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 18 Jun 2015 09:01:31 +0000 (11:01 +0200)

Trivial merge