Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next...
authorOlof Johansson <olof@lixom.net>
Mon, 26 Nov 2012 07:31:47 +0000 (23:31 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 26 Nov 2012 07:31:47 +0000 (23:31 -0800)
commit48b71e3ac138469e83d044db22020424aaa44753
tree5fdc072d847bf123b727f4b9e0732bb3a75bec2a
parent4cf90df38c412d60bae5e37c64602198fcad0ae6
parent5177ae56d1b6dcf4b23f1f89ed3be1c3dc0ad513
Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards

From Sascha Hauer:
ARM i.MX specific defconfig updates

* tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: imx: configs: Enable CONFIG_MEDIA_CAMERA_SUPPORT
  ARM: imx_v6_v7_defconfig: Add DA9052 regulator support
arch/arm/configs/imx_v6_v7_defconfig