From: James Morris <jmorris@namei.org>
Date: Wed, 19 Aug 2009 23:18:42 +0000 (+1000)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ece13879e74313e62109e0755dd3d4f172df89e2;p=linux.git

Merge branch 'master' into next

Conflicts:
	security/Kconfig

Manual fix.

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

ece13879e74313e62109e0755dd3d4f172df89e2