]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 16 Nov 2011 14:01:55 +0000 (15:01 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 16 Nov 2011 14:01:55 +0000 (15:01 +0100)

Trivial merge