]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.14/sony' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 2 Jan 2014 12:50:52 +0000 (13:50 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 2 Jan 2014 12:50:52 +0000 (13:50 +0100)

Trivial merge