]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.3/sony' into for-next
authorJiri Kosina <jkosina@suse.com>
Fri, 31 Jul 2015 07:37:27 +0000 (09:37 +0200)
committerJiri Kosina <jkosina@suse.com>
Fri, 31 Jul 2015 07:37:27 +0000 (09:37 +0200)

Trivial merge