Merge branch 'master' of git://dev.medozas.de/linux
authorPatrick McHardy <kaber@trash.net>
Tue, 18 Jan 2011 15:20:53 +0000 (16:20 +0100)
committerPatrick McHardy <kaber@trash.net>
Tue, 18 Jan 2011 15:20:53 +0000 (16:20 +0100)

Trivial merge