]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.12/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 26 Aug 2013 11:23:29 +0000 (13:23 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 26 Aug 2013 11:23:29 +0000 (13:23 +0200)

Trivial merge