From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 3 Jan 2012 21:22:31 +0000 (+0000)
Subject: Merge branch 'imx/board' into next/boards
X-Git-Tag: v3.3-rc1~140^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fc3eb81100c3f3cd44e706e54390151b0f1ce74;p=pandora-kernel.git

Merge branch 'imx/board' into next/boards

* imx/board: (4 commits)
  Enable 32 bit flash support for iMX21ADS board
  ARM: mx31pdk: Add MC13783 RTC support
  iomux-mx25: configuration to support CSPI3 on CSI pins
  MX1:apf9328: Add i2c support

Updated to v3.2-rc6, conflicts:
	arch/arm/kernel/setup.c
---

1fc3eb81100c3f3cd44e706e54390151b0f1ce74
Reading git-diff-tree failed