f3a0268389564
parent b536661bb0091b19123fa0c22f7087fd886d7b37
parent e09a716490dbce0b9b7d132d191f1f8785cb5df2
author Olof Johansson <olof@lixom.net> 1348294312 -0700
committer Olof Johansson <olof@lixom.net> 1348294312 -0700

Merge branch 'pxa/fixes' into next/fixes-non-critical

* pxa/fixes:
  ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()