]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 14 Jun 2011 08:47:12 +0000 (10:47 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 14 Jun 2011 08:47:12 +0000 (10:47 +0200)

Trivial merge