]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.14/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Fri, 20 Dec 2013 22:26:44 +0000 (23:26 +0100)
committerJiri Kosina <jkosina@suse.cz>
Fri, 20 Dec 2013 22:26:44 +0000 (23:26 +0100)

Trivial merge