git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e006d65 ee9ba0f)
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)
* 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


Trivial merge
Pandora Kernel Repository