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