git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cf90df 5177ae5)
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 patch | diff1 | diff2 | blob | history

diff --cc arch/arm/configs/imx_v6_v7_defconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.