]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Sat, 30 Oct 2010 20:16:56 +0000 (22:16 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sat, 30 Oct 2010 20:16:56 +0000 (22:16 +0200)

Trivial merge