From: Patrick McHardy <kaber@trash.net>
Date: Mon, 10 Aug 2009 15:14:59 +0000 (+0200)
Subject: Merge branch 'master' of git://dev.medozas.de/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=dc05a564ab1b3a1957927da50912964b61f7da69;p=linux.git

Merge branch 'master' of git://dev.medozas.de/linux
---

dc05a564ab1b3a1957927da50912964b61f7da69