Merge tag 'imx-features-board-20120411-2' of git://git.pengutronix.de/git/imx/linux...
authorOlof Johansson <olof@lixom.net>
Wed, 25 Apr 2012 18:04:14 +0000 (11:04 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 25 Apr 2012 18:04:14 +0000 (11:04 -0700)
* tag 'imx-features-board-20120411-2' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM i.MX: Visstrim_M10: Add board version detection.
  ARM: imx_v4_v5_defconfig: enable adc and touch driver of mc13783
  ARM: i.MX: i.MX35-PDK: Add regulator support

1  2 
arch/arm/configs/imx_v4_v5_defconfig
arch/arm/mach-imx/mach-mx35_3ds.c

Simple merge
Simple merge