Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorArnd Bergmann <arnd@arndb.de>
Tue, 28 Feb 2012 12:33:41 +0000 (12:33 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 28 Feb 2012 12:33:46 +0000 (12:33 +0000)
commitabf45ce84c4e36bd64aef20d7df9a79bd5e4b799
treef118e135bdd60b680703d1b38c7fdc7b9d7c503d
parent082f53c2f573c75a8f1610c587a43b6817e20f90
parentb1f91a9ce335eb4e0fef17c10f39a438ac3fce9b
Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc

* 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6: (2 commits)
  ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE
  ARM: imx: update imx_v6_v7_defconfig

(upadte to v3.3-rc5)
arch/arm/mach-omap2/pm24xx.c