| commit | abf45ce84c4e36bd64aef20d7df9a79bd5e4b799 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue Feb 28 12:33:41 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Feb 28 12:33:46 2012 +0000 |
| tree | f118e135bdd60b680703d1b38c7fdc7b9d7c503d | |
| parent | 082f53c2f573c75a8f1610c587a43b6817e20f90 [diff] | |
| parent | b1f91a9ce335eb4e0fef17c10f39a438ac3fce9b [diff] |
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)