]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
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)
* '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)

1  2 
arch/arm/mach-omap2/pm24xx.c

Simple merge