projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: afde962 15cc1b1)
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)
* '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

1  2 
arch/arm/configs/imx_v4_v5_defconfig patch | diff1 | diff2 | blob | history
arch/arm/configs/imx_v6_v7_defconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/configs/imx_v4_v5_defconfig
Simple merge
diff --cc arch/arm/configs/imx_v6_v7_defconfig
Simple merge
John Crispins staging tree