]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.15/sony' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 6 Feb 2014 08:46:18 +0000 (09:46 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 6 Feb 2014 08:46:18 +0000 (09:46 +0100)

Trivial merge