Merge branch 'depends/rmk/devel-stable' into next/board

Browse source

The exynos4 updates conflict with code from the arm devel-stable branch
and new boards need to set atag_offset in place of boot_param.

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-exynos4/include/mach/entry-macro.S
	arch/arm/mach-exynos4/mach-smdkc210.c
	arch/arm/mach-exynos4/mach-smdkv310.c
	arch/arm/mach-exynos4/mct.c

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

...

This commit is contained in:

Arnd Bergmann 2011-10-31 23:58:06 +01:00

parent 335332770c 531a6a9417

commit a7fadac10f

553 changed files with 8353 additions and 3035 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

104

arch/arm/Kconfig

View file

6

arch/arm/Kconfig.debug

View file

3

arch/arm/Makefile

View file

9

arch/arm/boot/compressed/.gitignore vendored

View file

32

arch/arm/boot/compressed/Makefile

View file

97

arch/arm/boot/compressed/atags_to_fdt.c

View file

122

arch/arm/boot/compressed/head.S

View file

15

arch/arm/boot/compressed/libfdt_env.h

View file

42

arch/arm/boot/compressed/misc.c

View file

127

arch/arm/boot/compressed/string.c

View file

4

arch/arm/boot/compressed/vmlinux.lds.in

View file

248

arch/arm/common/gic.c

View file

6

arch/arm/include/asm/cputype.h

View file

7

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

View file

7

arch/arm/include/asm/entry-macro-multi.S

View file

19

arch/arm/include/asm/exception.h

View file

3

arch/arm/include/asm/hardirq.h

View file

19

arch/arm/include/asm/hardware/entry-macro-gic.S

View file

9

arch/arm/include/asm/hardware/gic.h

View file

2

arch/arm/include/asm/hw_breakpoint.h

View file

19

arch/arm/include/asm/localtimer.h

View file

2

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

View file

1

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

View file

25

arch/arm/include/asm/memory.h

View file

4

arch/arm/include/asm/module.h

View file

3

arch/arm/include/asm/pgtable.h

View file

93

arch/arm/include/asm/pmu.h

View file

8

arch/arm/include/asm/proc-fns.h

View file

16

arch/arm/include/asm/smp.h

View file

2

arch/arm/include/asm/smp_twd.h

View file

17

arch/arm/include/asm/suspend.h

View file

7

arch/arm/include/asm/system.h

View file

33

arch/arm/include/asm/topology.h

View file

10

arch/arm/kernel/Makefile

View file

4

arch/arm/kernel/debug.S

View file

65

arch/arm/kernel/head.S

View file

279

arch/arm/kernel/hw_breakpoint.c

View file

5

arch/arm/kernel/irq.c

View file

4

arch/arm/kernel/kprobes-arm.c

View file

1323

arch/arm/kernel/kprobes-test-arm.c

View file

1187

arch/arm/kernel/kprobes-test-thumb.c

View file

1748

arch/arm/kernel/kprobes-test.c

View file

392

arch/arm/kernel/kprobes-test.h

View file

7

arch/arm/kernel/kprobes-thumb.c

View file

8

arch/arm/kernel/kprobes.h

View file

485

arch/arm/kernel/perf_event.c

View file

87

arch/arm/kernel/perf_event_v6.c

View file

405

arch/arm/kernel/perf_event_v7.c

View file

90

arch/arm/kernel/perf_event_xscale.c

View file

182

arch/arm/kernel/pmu.c

View file

21

arch/arm/kernel/setup.c

View file

87

arch/arm/kernel/sleep.S

View file

60

arch/arm/kernel/smp.c

View file

2

arch/arm/kernel/smp_scu.c

View file

47

arch/arm/kernel/smp_twd.c

View file

72

arch/arm/kernel/suspend.c

View file

148

arch/arm/kernel/topology.c

View file

1

arch/arm/kernel/traps.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

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