From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Mon, 12 Sep 2016 10:19:04 +0000 (+0100)
Subject: Merge branches 'fixes-pcmcia' and 'fixes-sa1111' into fixes
X-Git-Tag: v4.8-rc7~15^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1feafd64cbc31b75b7b08ab3ca0305311c3f6246;p=linux.git

Merge branches 'fixes-pcmcia' and 'fixes-sa1111' into fixes
---

1feafd64cbc31b75b7b08ab3ca0305311c3f6246