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

Trivial merge