Merge branch 'imx/board' into next/boards
authorArnd Bergmann <arnd@arndb.de>
Tue, 3 Jan 2012 21:22:31 +0000 (21:22 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 3 Jan 2012 21:22:46 +0000 (21:22 +0000)
commit1fc3eb81100c3f3cd44e706e54390151b0f1ce74
tree922f64310caa55a3b417958a1c256a96f47c4b66
parente006d6563bca989aeae1bc5ebc03dacdf5e15b32
parentee9ba0f2fd5819e377cdec974a2022a7af02a385
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
arch/arm/Kconfig
arch/arm/kernel/perf_event.c
arch/arm/kernel/setup.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-s5pv210/mach-smdkv210.c