Merge branch 'highmem' into devel
Conflicts: arch/arm/mach-clps7500/include/mach/memory.h
No related branches found
No related tags found
Showing
- arch/arm/include/asm/memory.h 5 additions, 2 deletionsarch/arm/include/asm/memory.h
- arch/arm/include/asm/page.h 18 additions, 12 deletionsarch/arm/include/asm/page.h
- arch/arm/include/asm/setup.h 4 additions, 2 deletionsarch/arm/include/asm/setup.h
- arch/arm/kernel/setup.c 21 additions, 16 deletionsarch/arm/kernel/setup.c
- arch/arm/mach-aaec2000/include/mach/memory.h 0 additions, 3 deletionsarch/arm/mach-aaec2000/include/mach/memory.h
- arch/arm/mach-at91/include/mach/memory.h 0 additions, 11 deletionsarch/arm/mach-at91/include/mach/memory.h
- arch/arm/mach-clps711x/include/mach/memory.h 1 addition, 19 deletionsarch/arm/mach-clps711x/include/mach/memory.h
- arch/arm/mach-davinci/include/mach/memory.h 0 additions, 6 deletionsarch/arm/mach-davinci/include/mach/memory.h
- arch/arm/mach-ebsa110/include/mach/memory.h 0 additions, 7 deletionsarch/arm/mach-ebsa110/include/mach/memory.h
- arch/arm/mach-ep93xx/include/mach/memory.h 0 additions, 4 deletionsarch/arm/mach-ep93xx/include/mach/memory.h
- arch/arm/mach-footbridge/include/mach/memory.h 9 additions, 0 deletionsarch/arm/mach-footbridge/include/mach/memory.h
- arch/arm/mach-h720x/include/mach/memory.h 0 additions, 17 deletionsarch/arm/mach-h720x/include/mach/memory.h
- arch/arm/mach-imx/include/mach/memory.h 0 additions, 10 deletionsarch/arm/mach-imx/include/mach/memory.h
- arch/arm/mach-integrator/include/mach/memory.h 1 addition, 8 deletionsarch/arm/mach-integrator/include/mach/memory.h
- arch/arm/mach-iop13xx/include/mach/memory.h 2 additions, 14 deletionsarch/arm/mach-iop13xx/include/mach/memory.h
- arch/arm/mach-iop32x/include/mach/memory.h 0 additions, 11 deletionsarch/arm/mach-iop32x/include/mach/memory.h
- arch/arm/mach-iop33x/include/mach/memory.h 0 additions, 11 deletionsarch/arm/mach-iop33x/include/mach/memory.h
- arch/arm/mach-ixp2000/include/mach/memory.h 0 additions, 7 deletionsarch/arm/mach-ixp2000/include/mach/memory.h
- arch/arm/mach-ixp23xx/include/mach/memory.h 0 additions, 13 deletionsarch/arm/mach-ixp23xx/include/mach/memory.h
- arch/arm/mach-ixp4xx/include/mach/memory.h 0 additions, 12 deletionsarch/arm/mach-ixp4xx/include/mach/memory.h
Loading
Please register or sign in to comment