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

This commit is contained in:
Russell King 2016-09-12 11:19:04 +01:00
commit 1feafd64cb