]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 10 Sep 2012 21:01:14 +0000 (23:01 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 10 Sep 2012 21:01:14 +0000 (23:01 +0200)

Trivial merge