Merge branches 'fixes-pcmcia' and 'fixes-sa1111' into fixes
authorRussell King <rmk+kernel@armlinux.org.uk>
Mon, 12 Sep 2016 10:19:04 +0000 (11:19 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Mon, 12 Sep 2016 10:19:04 +0000 (11:19 +0100)

Trivial merge