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

Trivial merge