From: James Morris <jmorris@namei.org>
Date: Mon, 22 Sep 2008 00:41:56 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.6.28-rc1~724^2^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ab2b49518e743962f71b94246855c44ee9cf52cc;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'master' into next

Conflicts:

	MAINTAINERS

Thanks for breaking my tree :-)

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

ab2b49518e743962f71b94246855c44ee9cf52cc