Merge branch 'depends/rmk/memory_h' into next/cleanup2

Browse source

There are lots of conflicts between the omap and exynos cleanups
and the memory.h remove series.

Conflicts:
	arch/arm/mach-exynos4/mach-smdkc210.c
	arch/arm/mach-exynos4/mach-smdkv310.c
	arch/arm/mach-imx/mach-cpuimx27.c
	arch/arm/mach-omap1/board-ams-delta.c
	arch/arm/mach-omap1/board-generic.c
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-h3.c
	arch/arm/mach-omap1/board-nokia770.c
	arch/arm/mach-omap1/board-osk.c
	arch/arm/mach-omap1/board-palmte.c
	arch/arm/mach-omap1/board-palmtt.c
	arch/arm/mach-omap1/board-palmz71.c
	arch/arm/mach-omap1/board-sx1.c
	arch/arm/mach-omap1/board-voiceblue.c
	arch/arm/mach-omap1/io.c
	arch/arm/mach-omap2/board-generic.c
	arch/arm/mach-omap2/io.c
	arch/arm/plat-omap/io.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

...

This commit is contained in:

Arnd Bergmann 2011-11-01 04:58:59 +01:00

parent c6c3a3a03e 0cdc8b921d

commit cfaf8fc5b5

463 changed files with 827 additions and 1662 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

46

arch/arm/Kconfig

View file

3

arch/arm/Makefile

View file

7

arch/arm/include/asm/dma-mapping.h

View file

2

arch/arm/include/asm/mach/arch.h

View file

25

arch/arm/include/asm/memory.h

View file

4

arch/arm/include/asm/module.h

View file

4

arch/arm/kernel/debug.S

View file

65

arch/arm/kernel/head.S

View file

21

arch/arm/kernel/setup.c

View file

2

arch/arm/mach-at91/at91sam9g45.c

View file

2

arch/arm/mach-at91/include/mach/at91sam9g45.h

View file

2

arch/arm/mach-at91/include/mach/debug-macro.S

View file

3

arch/arm/mach-bcmring/include/mach/hardware.h

View file

33

arch/arm/mach-bcmring/include/mach/memory.h

View file

3

arch/arm/mach-bcmring/mm.c

View file

2

arch/arm/mach-clps711x/autcpu12.c

View file

2

arch/arm/mach-clps711x/cdb89712.c

View file

2

arch/arm/mach-clps711x/ceiva.c

View file

2

arch/arm/mach-clps711x/clep7312.c

View file

2

arch/arm/mach-clps711x/edb7211-arch.c

View file

1

arch/arm/mach-clps711x/fortunet.c

View file

2

arch/arm/mach-clps711x/include/mach/debug-macro.S

View file

2

arch/arm/mach-clps711x/p720t.c

View file

2

arch/arm/mach-cns3xxx/cns3420vb.c

View file

2

arch/arm/mach-cns3xxx/include/mach/debug-macro.S

View file

26

arch/arm/mach-cns3xxx/include/mach/memory.h

View file

2

arch/arm/mach-davinci/board-da830-evm.c

View file

2

arch/arm/mach-davinci/board-da850-evm.c

View file

2

arch/arm/mach-davinci/board-dm355-evm.c

View file

2

arch/arm/mach-davinci/board-dm355-leopard.c

View file

2

arch/arm/mach-davinci/board-dm365-evm.c

View file

2

arch/arm/mach-davinci/board-dm644x-evm.c

View file

4

arch/arm/mach-davinci/board-dm646x-evm.c

View file

2

arch/arm/mach-davinci/board-mityomapl138.c

View file

2

arch/arm/mach-davinci/board-neuros-osd2.c

View file

2

arch/arm/mach-davinci/board-omapl138-hawk.c

View file

2

arch/arm/mach-davinci/board-sffsdr.c

View file

2

arch/arm/mach-davinci/board-tnetv107x-evm.c

View file

3

arch/arm/mach-davinci/common.c

View file

2

arch/arm/mach-davinci/cpuidle.c

View file

4

arch/arm/mach-davinci/include/mach/ddr2.h

View file

52

arch/arm/mach-davinci/include/mach/debug-macro.S

View file

44

arch/arm/mach-davinci/include/mach/memory.h

View file

3

arch/arm/mach-davinci/include/mach/serial.h

View file

7

arch/arm/mach-davinci/include/mach/uncompress.h

View file

2

arch/arm/mach-davinci/sleep.S

View file

2

arch/arm/mach-dove/cm-a510.c

View file

2

arch/arm/mach-dove/dove-db-setup.c

View file

2

arch/arm/mach-dove/include/mach/debug-macro.S

View file

10

arch/arm/mach-dove/include/mach/memory.h

View file

2

arch/arm/mach-ebsa110/core.c

View file

2

arch/arm/mach-ebsa110/include/mach/debug-macro.S

View file

2

arch/arm/mach-ep93xx/adssphere.c

View file

16

arch/arm/mach-ep93xx/edb93xx.c

View file

2

arch/arm/mach-ep93xx/gesbc9312.c

View file

2

arch/arm/mach-ep93xx/include/mach/debug-macro.S

View file

8

arch/arm/mach-ep93xx/micro9.c

View file

4

arch/arm/mach-ep93xx/simone.c

View file

2

arch/arm/mach-ep93xx/snappercl15.c

View file

2

arch/arm/mach-ep93xx/ts72xx.c

View file

2

arch/arm/mach-exynos4/include/mach/debug-macro.S

View file

2

arch/arm/mach-exynos4/mach-armlex4210.c

View file

2

arch/arm/mach-exynos4/mach-nuri.c

View file

2

arch/arm/mach-exynos4/mach-universal_c210.c

View file

2

arch/arm/mach-footbridge/cats-hw.c

View file

2

arch/arm/mach-footbridge/ebsa285.c

View file

4

arch/arm/mach-footbridge/include/mach/debug-macro.S

View file

2

arch/arm/mach-footbridge/netwinder-hw.c

View file

2

arch/arm/mach-footbridge/personal.c

View file

2

arch/arm/mach-gemini/board-nas4220b.c

View file

2

arch/arm/mach-gemini/board-rut1xx.c

View file

2

arch/arm/mach-gemini/board-wbd111.c

View file

2

arch/arm/mach-gemini/board-wbd222.c

View file

2

arch/arm/mach-gemini/include/mach/debug-macro.S

View file

19

arch/arm/mach-gemini/include/mach/memory.h

View file

2

arch/arm/mach-h720x/h7201-eval.c

View file

2

arch/arm/mach-h720x/h7202-eval.c

View file

2

arch/arm/mach-h720x/include/mach/debug-macro.S

View file

11

arch/arm/mach-h720x/include/mach/memory.h

View file

2

arch/arm/mach-imx/mach-armadillo5x0.c

View file

2

arch/arm/mach-imx/mach-cpuimx27.c

View file

2

arch/arm/mach-imx/mach-cpuimx35.c

View file

2

arch/arm/mach-imx/mach-eukrea_cpuimx25.c

View file

2

arch/arm/mach-imx/mach-imx27_visstrim_m10.c

View file

2

arch/arm/mach-imx/mach-imx27ipcam.c

View file

2

arch/arm/mach-imx/mach-imx27lite.c

View file

2

arch/arm/mach-imx/mach-kzm_arm11_01.c

View file

4

arch/arm/mach-imx/mach-mx1ads.c

View file

2

arch/arm/mach-imx/mach-mx21ads.c

View file

2

arch/arm/mach-imx/mach-mx25_3ds.c

View file

2

arch/arm/mach-imx/mach-mx27_3ds.c

View file

2

arch/arm/mach-imx/mach-mx27ads.c

View file

2

arch/arm/mach-imx/mach-mx31_3ds.c

View file

2

arch/arm/mach-imx/mach-mx31ads.c

View file

2

arch/arm/mach-imx/mach-mx31lilly.c

View file

2

arch/arm/mach-imx/mach-mx31lite.c

View file

2

arch/arm/mach-imx/mach-mx31moboard.c

View file

2

arch/arm/mach-imx/mach-mx35_3ds.c

View file

2

arch/arm/mach-imx/mach-mxt_td60.c

View file

2

arch/arm/mach-imx/mach-pca100.c

View file

Some files were not shown because too many files have changed in this diff Show more