]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit3053b63dcc9d5aa3435db721d7471b5db15ffc9b
treee7bf466d8c49d8bd86b3edb906a7ca5cd592bcf5
parent61e1e89f8ed7939721a623a5e5ed384111d1b1ec
parentdf73adda63c9dc09cce57f0156c5336dfebf859e
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