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)
commit1feafd64cbc31b75b7b08ab3ca0305311c3f6246
tree93febf132b9beca529b9a0df0de3eae084d6b9e6
parent817ed5748e40bbc5b5f2aa0c3094c4a7adfb8881
parent87d5dd62c07f90ed2b0d6718f5c666f69e7d39b0
Merge branches 'fixes-pcmcia' and 'fixes-sa1111' into fixes