Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: 
Arnd Bergmann <arnd@arndb.de>
No related branches found
No related tags found
Showing
- arch/arm/Kconfig 36 additions, 10 deletionsarch/arm/Kconfig
- arch/arm/Makefile 3 additions, 0 deletionsarch/arm/Makefile
- arch/arm/include/asm/dma-mapping.h 7 additions, 0 deletionsarch/arm/include/asm/dma-mapping.h
- arch/arm/include/asm/mach/arch.h 1 addition, 1 deletionarch/arm/include/asm/mach/arch.h
- arch/arm/include/asm/memory.h 8 additions, 17 deletionsarch/arm/include/asm/memory.h
- arch/arm/include/asm/module.h 0 additions, 4 deletionsarch/arm/include/asm/module.h
- arch/arm/kernel/debug.S 2 additions, 2 deletionsarch/arm/kernel/debug.S
- arch/arm/kernel/head.S 15 additions, 50 deletionsarch/arm/kernel/head.S
- arch/arm/kernel/setup.c 2 additions, 19 deletionsarch/arm/kernel/setup.c
- arch/arm/mach-at91/at91sam9g45.c 2 additions, 0 deletionsarch/arm/mach-at91/at91sam9g45.c
- arch/arm/mach-at91/include/mach/at91sam9g45.h 0 additions, 2 deletionsarch/arm/mach-at91/include/mach/at91sam9g45.h
- arch/arm/mach-at91/include/mach/debug-macro.S 1 addition, 1 deletionarch/arm/mach-at91/include/mach/debug-macro.S
- arch/arm/mach-bcmring/include/mach/hardware.h 1 addition, 2 deletionsarch/arm/mach-bcmring/include/mach/hardware.h
- arch/arm/mach-bcmring/include/mach/memory.h 0 additions, 33 deletionsarch/arm/mach-bcmring/include/mach/memory.h
- arch/arm/mach-bcmring/mm.c 3 additions, 0 deletionsarch/arm/mach-bcmring/mm.c
- arch/arm/mach-clps711x/autcpu12.c 1 addition, 1 deletionarch/arm/mach-clps711x/autcpu12.c
- arch/arm/mach-clps711x/cdb89712.c 1 addition, 1 deletionarch/arm/mach-clps711x/cdb89712.c
- arch/arm/mach-clps711x/ceiva.c 1 addition, 1 deletionarch/arm/mach-clps711x/ceiva.c
- arch/arm/mach-clps711x/clep7312.c 1 addition, 1 deletionarch/arm/mach-clps711x/clep7312.c
- arch/arm/mach-clps711x/edb7211-arch.c 1 addition, 1 deletionarch/arm/mach-clps711x/edb7211-arch.c
Loading
Please register or sign in to comment