diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-10-25 15:49:01 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-10-25 15:49:01 +0200 |
commit | bc20debaa99163ec9af91fefdd356978d687fdf8 (patch) | |
tree | 7dd6f8742afc875fed95259355c439f7732edcfa /arch/arm/mach-imx/clk-imx27.c | |
parent | Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes (diff) | |
parent | ARM: ux500: Correct SDI5 address and add some format changes (diff) | |
download | linux-bc20debaa99163ec9af91fefdd356978d687fdf8.tar.xz linux-bc20debaa99163ec9af91fefdd356978d687fdf8.zip |
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>
Diffstat (limited to 'arch/arm/mach-imx/clk-imx27.c')
0 files changed, 0 insertions, 0 deletions