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)
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


Trivial merge