| commit | 1fc3eb81100c3f3cd44e706e54390151b0f1ce74 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue Jan 03 21:22:31 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Jan 03 21:22:46 2012 +0000 |
| tree | 922f64310caa55a3b417958a1c256a96f47c4b66 | |
| parent | e006d6563bca989aeae1bc5ebc03dacdf5e15b32 [diff] | |
| parent | ee9ba0f2fd5819e377cdec974a2022a7af02a385 [diff] |
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