]> 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, 3 Dec 2013 14:20:03 +0000 (15:20 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 3 Dec 2013 14:20:03 +0000 (15:20 +0100)

Trivial merge