Merge branch 'pxa/fixes' into next/fixes-non-critical
authorOlof Johansson <olof@lixom.net>
Sat, 22 Sep 2012 06:11:52 +0000 (23:11 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 22 Sep 2012 06:11:52 +0000 (23:11 -0700)
* pxa/fixes:
  ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()


Trivial merge