tree e7bf466d8c49d8bd86b3edb906a7ca5cd592bcf5
parent a92e7023caf6c3a58b047a4c3fc9e4981b327bb8
parent 5616131daff6047d293b25a05cff7b1890efd6a3
author Olof Johansson <olof@lixom.net> 1333078578 -0700
committer Olof Johansson <olof@lixom.net> 1333078578 -0700

Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes

* 'fixes' of git://github.com/hzhuang1/linux:
  ARM: pxa: fix build issue on stargate2
  ARM: pxa: fix build issue on cm-x300
  ARM: pxa: fix build failure for regulator consumer in em-x270.c
  ARM: pxa: fix regulator related build fail in magician_defconfig