diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:24:28 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:24:28 +0100 |
commit | 7e0cac630c7c90f12a78131df9913657fa30243b (patch) | |
tree | c09aa76b07a9bcb0ab0dea4885909421f7a9f4a6 /arch/arm/mach-s3c2410 | |
parent | Merge branch 'dt/gic' into imx/imx6q (diff) | |
parent | Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linu... (diff) | |
download | linux-7e0cac630c7c90f12a78131df9913657fa30243b.tar.xz linux-7e0cac630c7c90f12a78131df9913657fa30243b.zip |
Merge branch 'imx/devel' into imx/imx6q
Conflicts:
arch/arm/plat-mxc/include/mach/memory.h
Diffstat (limited to 'arch/arm/mach-s3c2410')
0 files changed, 0 insertions, 0 deletions