From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 30 Jun 2010 10:00:01 +0000 (+0100)
Subject: Merge git://git.linaro.org/nico/arm_security into devel-stable
X-Git-Tag: v2.6.36-rc1~591^2^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc4978b796e5e52ab3a709495a968199afe0a108;p=thirdparty%2Fkernel%2Flinux.git

Merge git://git.linaro.org/nico/arm_security into devel-stable
---

fc4978b796e5e52ab3a709495a968199afe0a108