Merge tag 'pxa-fixes-v4.2-rc2' of https://github.com/rjarzmik/linux into fixesD
authorOlof Johansson <olof@lixom.net>
Sun, 19 Jul 2015 04:06:10 +0000 (21:06 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 19 Jul 2015 04:06:10 +0000 (21:06 -0700)
commit3eae03daa538303e0d28f56412c6c51f6452e493
tree767cd65426e5e041f741f46327a77df7a259cc8d
parent47295aa4380dc990c38f86ec67fea425dcfd64c6
parenta927ef895e288e79f1bfed221f27d7bfa37e907f
Merge tag 'pxa-fixes-v4.2-rc2' of https://github.com/rjarzmik/linux into fixesD

Merge "pxa fixes for v4.2" from Robert Jarzmik:

ARM: pxa: fixes for v4.2-rc2

This single fix reenables ethernet cards for several pxa boards,
broken by regulator addition to dm9000 driver.

* tag 'pxa-fixes-v4.2-rc2' of https://github.com/rjarzmik/linux:
  ARM: pxa: fix dm9000 platform data regression