]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.13/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 14 Oct 2013 14:11:12 +0000 (16:11 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 14 Oct 2013 14:11:12 +0000 (16:11 +0200)

Trivial merge