Merge branch 'pcmcia' of git://git.linaro.org/people/rmk/linux-arm