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)
commitfd273d4415027f9b519d5a94e4fc030f278f2ad3
tree5c45f3b95817b82bff534e4b1f094c0147a23393
parent66f75a5d028beaf67c931435fdc3e7823125730c
parent435ca24116bc5365a10fa0be1bf1c1e4c5680157
Merge tag 'imx-features-board-20120411-2' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards

* 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
arch/arm/configs/imx_v4_v5_defconfig
arch/arm/mach-imx/mach-mx35_3ds.c