]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.14/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 6 Jan 2014 15:44:27 +0000 (16:44 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 6 Jan 2014 15:44:27 +0000 (16:44 +0100)

Trivial merge