Merge branch 'samsung/dt' into samsung/cleanup

Browse source

Conflicts:
	arch/arm/mach-s3c64xx/Makefile
	arch/arm/mach-s5pc100/Makefile
	arch/arm/mach-s5pv210/Makefile

Pull in previously resolved conflicts:

The Makefiles were reorganized in the "rmk/restart" series and modified
in the "samsung/cleanup series". This also pulls in the other conflict
resolutions from the restart series against the samsung/dt series.

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

...

This commit is contained in:

Arnd Bergmann 2012-01-09 16:01:00 +00:00

parent 65db039bf7 928a11ba36

commit a07613a54d

1285 changed files with 13157 additions and 13546 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

11

Documentation/arm/memory.txt

View file

4

Documentation/devicetree/bindings/arm/gic.txt

View file

29

Documentation/devicetree/bindings/arm/vic.txt

View file

16

Documentation/virtual/kvm/api.txt

View file

33

MAINTAINERS

View file

2

Makefile

View file

64

arch/arm/Kconfig

View file

45

arch/arm/Kconfig.debug

View file

2

arch/arm/Makefile

View file

3

arch/arm/boot/compressed/Makefile

View file

1

arch/arm/boot/compressed/head.S

View file

6

arch/arm/common/Kconfig

View file

165

arch/arm/common/gic.c

View file

120

arch/arm/common/pl330.c

View file

7

arch/arm/common/timer-sp.c

View file

140

arch/arm/common/vic.c

View file

12

arch/arm/configs/imx_v4_v5_defconfig

View file

175

arch/arm/configs/pcontrol_g20_defconfig

View file

11

arch/arm/include/asm/assembler.h

View file

1

arch/arm/include/asm/bug.h

View file

179

arch/arm/include/asm/cti.h

View file

48

arch/arm/include/asm/edac.h

View file

57

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

View file

4

arch/arm/include/asm/gpio.h

View file

17

arch/arm/include/asm/hardirq.h

View file

60

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

View file

26

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

View file

1

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

View file

12

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

View file

14

arch/arm/include/asm/idmap.h

View file

9

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

View file

20

arch/arm/include/asm/opcodes.h

View file

4

arch/arm/include/asm/page.h

View file

3

arch/arm/include/asm/perf_event.h

View file

26

arch/arm/include/asm/pgalloc.h

View file

41

arch/arm/include/asm/pgtable-2level.h

View file

77

arch/arm/include/asm/pgtable-3level-hwdef.h

View file

70

arch/arm/include/asm/pgtable-3level-types.h

View file

155

arch/arm/include/asm/pgtable-3level.h

View file

4

arch/arm/include/asm/pgtable-hwdef.h

View file

55

arch/arm/include/asm/pgtable.h

View file

15

arch/arm/include/asm/pmu.h

View file

21

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

View file

2

arch/arm/include/asm/processor.h

View file

108

arch/arm/include/asm/sched_clock.h

View file

6

arch/arm/include/asm/setup.h

View file

5

arch/arm/include/asm/swab.h

View file

10

arch/arm/include/asm/system.h

View file

12

arch/arm/include/asm/tlb.h

View file

2

arch/arm/kernel/Makefile

View file

7

arch/arm/kernel/entry-armv.S

View file

65

arch/arm/kernel/head.S

View file

8

arch/arm/kernel/hw_breakpoint.c

View file

66

arch/arm/kernel/kprobes-test.c

View file

15

arch/arm/kernel/machine_kexec.c

View file

72

arch/arm/kernel/opcodes.c

View file

19

arch/arm/kernel/perf_event.c

View file

4

arch/arm/kernel/perf_event_v6.c

View file

331

arch/arm/kernel/perf_event_v7.c

View file

2

arch/arm/kernel/perf_event_xscale.c

View file

75

arch/arm/kernel/process.c

View file

118

arch/arm/kernel/sched_clock.c

View file

15

arch/arm/kernel/setup.c

View file

4

arch/arm/kernel/sleep.S

View file

36

arch/arm/kernel/smp.c

View file

93

arch/arm/kernel/smp_twd.c

View file

18

arch/arm/kernel/suspend.c

View file

16

arch/arm/kernel/swp_emulate.c

View file

22

arch/arm/kernel/tcm.c

View file

7

arch/arm/kernel/vmlinux.lds.S

View file

3

arch/arm/lib/Makefile

View file

44

arch/arm/lib/call_with_stack.S

View file

24

arch/arm/mach-at91/Kconfig

View file

44

arch/arm/mach-at91/at91cap9.c

View file

49

arch/arm/mach-at91/at91cap9_devices.c

View file

28

arch/arm/mach-at91/at91rm9200.c

View file

48

arch/arm/mach-at91/at91rm9200_devices.c

View file

8

arch/arm/mach-at91/at91rm9200_time.c

View file

38

arch/arm/mach-at91/at91sam9260.c

View file

55

arch/arm/mach-at91/at91sam9260_devices.c

View file

34

arch/arm/mach-at91/at91sam9261.c

View file

33

arch/arm/mach-at91/at91sam9261_devices.c

View file

47

arch/arm/mach-at91/at91sam9263.c

View file

59

arch/arm/mach-at91/at91sam9263_devices.c

View file

38

arch/arm/mach-at91/at91sam926x_time.c

View file

9

arch/arm/mach-at91/at91sam9_alt_reset.S

View file

48

arch/arm/mach-at91/at91sam9g45.c

View file

69

arch/arm/mach-at91/at91sam9g45_devices.c

View file

38

arch/arm/mach-at91/at91sam9rl.c

View file

43

arch/arm/mach-at91/at91sam9rl_devices.c

View file

4

arch/arm/mach-at91/board-1arm.c

View file

10

arch/arm/mach-at91/board-afeb-9260v1.c

View file

8

arch/arm/mach-at91/board-cam60.c

View file

21

arch/arm/mach-at91/board-cap9adk.c

View file

9

arch/arm/mach-at91/board-carmeva.c

View file

14

arch/arm/mach-at91/board-cpu9krea.c

View file

7

arch/arm/mach-at91/board-cpuat91.c

View file

7

arch/arm/mach-at91/board-csb337.c

View file

4

arch/arm/mach-at91/board-csb637.c

View file

3

arch/arm/mach-at91/board-dt.c

View file

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