]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.14/sony' into for-next
authorJiri Kosina <jkosina@suse.cz>
Fri, 17 Jan 2014 09:48:03 +0000 (10:48 +0100)
committerJiri Kosina <jkosina@suse.cz>
Fri, 17 Jan 2014 09:48:03 +0000 (10:48 +0100)

Trivial merge