]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.11/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 3 Jun 2013 11:33:37 +0000 (13:33 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 3 Jun 2013 11:33:37 +0000 (13:33 +0200)

Trivial merge