]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.12/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 5 Sep 2013 08:18:14 +0000 (10:18 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 5 Sep 2013 08:18:14 +0000 (10:18 +0200)

Trivial merge