From: James Morris Date: Wed, 19 Aug 2009 23:18:42 +0000 (+1000) Subject: Merge branch 'master' into next X-Git-Tag: v2.6.32-rc1~737^2^2~24 X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=ece13879e74313e62109e0755dd3d4f172df89e2 Merge branch 'master' into next Conflicts: security/Kconfig Manual fix. Signed-off-by: James Morris --- ece13879e74313e62109e0755dd3d4f172df89e2