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)
commitb10731fb567e9029113089119b296a012a8310d7
tree2eedded112c1c6b993052a46a09f3a0268389564
parentb536661bb0091b19123fa0c22f7087fd886d7b37
parente09a716490dbce0b9b7d132d191f1f8785cb5df2
Merge branch 'pxa/fixes' into next/fixes-non-critical

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