From: James Morris <jmorris@namei.org>
Date: Mon, 22 Sep 2008 00:41:56 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ab2b49518e743962f71b94246855c44ee9cf52cc;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master' into next

Conflicts:

	MAINTAINERS

Thanks for breaking my tree :-)

Signed-off-by: James Morris <jmorris@namei.org>
---

ab2b49518e743962f71b94246855c44ee9cf52cc