From: Olof Johansson <olof@lixom.net>
Date: Fri, 30 Mar 2012 03:36:18 +0000 (-0700)
Subject: Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
X-Git-Tag: v3.4-rc1~30^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f00e9b11863abdb837e555a2b1e3417e8b5d80dd;p=~emulex%2Finfiniband.git

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

f00e9b11863abdb837e555a2b1e3417e8b5d80dd