Merge branch 'imx-drivers' of git://git.pengutronix.de/git/imx/linux-2.6 into next...
authorArnd Bergmann <arnd@arndb.de>
Mon, 27 Feb 2012 13:42:09 +0000 (13:42 +0000)
committerArnd Bergmann <arnd@arndb.de>
Mon, 27 Feb 2012 13:42:09 +0000 (13:42 +0000)
commitdae2efd750393565a90fa75eeab289dbeacc166e
tree7923561b311b492c1550fe6ebc90e482c69260da
parentafde9626089e3d0c32090120960d1e32f65e3be4
parent15cc1b1c1e8848ffa711f4ea24c919627a1159da
Merge branch 'imx-drivers' of git://git.pengutronix.de/git/imx/linux-2.6 into next/drivers

* 'imx-drivers' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: imx_v4_v5_defconfig: Update defconfig
  ARM: mx27_3ds: Add camera support
  ARM: imx_v6_v7_defconfig: Add support for framebuffer and camera on mx31
arch/arm/configs/imx_v4_v5_defconfig
arch/arm/configs/imx_v6_v7_defconfig