]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 5 Sep 2012 09:56:42 +0000 (11:56 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 5 Sep 2012 09:56:42 +0000 (11:56 +0200)

Trivial merge