| commit | dae2efd750393565a90fa75eeab289dbeacc166e | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Feb 27 13:42:09 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Feb 27 13:42:09 2012 +0000 |
| tree | 7923561b311b492c1550fe6ebc90e482c69260da | |
| parent | afde9626089e3d0c32090120960d1e32f65e3be4 [diff] | |
| parent | 15cc1b1c1e8848ffa711f4ea24c919627a1159da [diff] |
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