From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 13 Aug 2013 19:23:28 +0000 (+0100)
Subject: Merge branch 'security-fixes' into fixes
X-Git-Tag: v3.11-rc6~5^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2a2822475d0e734adffab72644329d9c042ce2e1;p=linux.git

Merge branch 'security-fixes' into fixes
---

2a2822475d0e734adffab72644329d9c042ce2e1