]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Fri, 7 Sep 2012 12:55:46 +0000 (14:55 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 7 Sep 2012 12:55:46 +0000 (14:55 +0200)

Trivial merge