Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
authorOlof Johansson <olof@lixom.net>
Fri, 30 Mar 2012 03:36:18 +0000 (20:36 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 30 Mar 2012 03:36:18 +0000 (20:36 -0700)
commitf00e9b11863abdb837e555a2b1e3417e8b5d80dd
treee7bf466d8c49d8bd86b3edb906a7ca5cd592bcf5
parenta92e7023caf6c3a58b047a4c3fc9e4981b327bb8
parent5616131daff6047d293b25a05cff7b1890efd6a3
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
arch/arm/mach-pxa/cm-x300.c
arch/arm/mach-pxa/hx4700.c
arch/arm/mach-pxa/magician.c