]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.14/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 17 Dec 2013 12:57:18 +0000 (13:57 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 17 Dec 2013 12:57:18 +0000 (13:57 +0100)

Trivial merge