]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream-fixes' into for-next
authorJiri Kosina <jkosina@suse.cz>
Sat, 8 Oct 2011 21:21:25 +0000 (23:21 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sat, 8 Oct 2011 21:21:25 +0000 (23:21 +0200)

Trivial merge