From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 5 Dec 2014 16:30:47 +0000 (+0000)
Subject: Merge branches 'fixes', 'misc', 'pm' and 'sa1100' into for-next
X-Git-Tag: v3.19-rc1~98^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fbe4dd088f449cbae586aa8af51d271297c75f9f;p=users%2Fjedix%2Flinux-maple.git

Merge branches 'fixes', 'misc', 'pm' and 'sa1100' into for-next
---

fbe4dd088f449cbae586aa8af51d271297c75f9f