From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 3 Aug 2013 09:49:38 +0000 (+0100)
Subject: Merge branch 'security-fixes' into fixes
X-Git-Tag: v3.11-rc4~8^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e35ac62d2202e31307c0f9b278a61e484c4727f2;p=users%2Fjedix%2Flinux-maple.git

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

e35ac62d2202e31307c0f9b278a61e484c4727f2