]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.12/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 5 Aug 2013 09:30:03 +0000 (11:30 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 5 Aug 2013 09:30:03 +0000 (11:30 +0200)

Trivial merge