Merge branch 'master' of git://dev.medozas.de/linux
Patrick McHardy [Tue, 11 May 2010 16:59:21 +0000 (18:59 +0200)]

Trivial merge