]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
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)
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

1  2 
arch/arm/configs/imx_v6_v7_defconfig

Simple merge