| commit | bc20debaa99163ec9af91fefdd356978d687fdf8 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Oct 25 15:49:01 2012 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Oct 25 15:49:01 2012 +0200 |
| tree | 7dd6f8742afc875fed95259355c439f7732edcfa | |
| parent | 2adca5672ffe3121bbb3bd061af9f047e0f8023f [diff] | |
| parent | 76ff4e434734f7772d1a592cc9fe1d9921a3ec40 [diff] |
Merge branch 'for-rcs-3.7' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into fixes * 'for-rcs-3.7' of git://git.linaro.org/people/ljones/linux-3.0-ux500: ARM: ux500: Correct SDI5 address and add some format changes ARM: ux500: Specify AMBA Primecell IDs for Nomadik I2C in DT ARM: ux500: Fix build error relating to IRQCHIP_SKIP_SET_WAKE Signed-off-by: Arnd Bergmann <arnd@arndb.de>