From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 19 Aug 2013 23:31:33 +0000 (+0100)
Subject: Merge branch 'security-fixes' into fixes
X-Git-Tag: v3.11-rc7~3^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e1f020371c08ea93be417ba3b1990b169e7e6e36;p=users%2Fdwmw2%2Flinux.git

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

e1f020371c08ea93be417ba3b1990b169e7e6e36