Merge commit 'v2.6.37-rc8' into x86/apic

Browse source

Conflicts:
	arch/x86/include/asm/io_apic.h

Merge reason: move to a fresh -rc, resolve the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2011-01-04 09:43:42 +01:00

parent d3bd058826 387c31c7e5

commit bc030d6cb9

9577 changed files with 1011657 additions and 554695 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

14

arch/Kconfig

View file

7

arch/alpha/Kconfig

View file

2

arch/alpha/include/asm/core_mcpcia.h

View file

54

arch/alpha/include/asm/core_t2.h

View file

2

arch/alpha/include/asm/pgtable.h

View file

11

arch/alpha/kernel/core_t2.c

View file

3

arch/alpha/kernel/machvec_impl.h

View file

4

arch/alpha/kernel/pci_iommu.c

View file

7

arch/alpha/kernel/ptrace.c

View file

58

arch/arm/Kconfig

View file

5

arch/arm/boot/Makefile

View file

2

arch/arm/boot/bootp/init.S

View file

15

arch/arm/boot/compressed/head.S

View file

2

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

View file

64

arch/arm/common/gic.c

View file

2

arch/arm/common/icst.c

View file

1

arch/arm/common/it8152.c

View file

12

arch/arm/common/scoop.c

View file

18

arch/arm/common/uengine.c

View file

341

arch/arm/configs/at91rm9200_defconfig

View file

72

arch/arm/configs/at91rm9200dk_defconfig

View file

73

arch/arm/configs/at91rm9200ek_defconfig

View file

131

arch/arm/configs/ateb9200_defconfig

View file

47

arch/arm/configs/carmeva_defconfig

View file

112

arch/arm/configs/cpuat91_defconfig

View file

104

arch/arm/configs/csb337_defconfig

View file

98

arch/arm/configs/csb637_defconfig

View file

3

arch/arm/configs/da8xx_omapl_defconfig

View file

99

arch/arm/configs/ecbat91_defconfig

View file

61

arch/arm/configs/kafa_defconfig

View file

127

arch/arm/configs/kb9202_defconfig

View file

1

arch/arm/configs/mx51_defconfig

View file

94

arch/arm/configs/n8x0_defconfig

View file

51

arch/arm/configs/omap3_defconfig → arch/arm/configs/omap2plus_defconfig

View file

125

arch/arm/configs/omap_4430sdp_defconfig

View file

37

arch/arm/configs/omap_generic_2420_defconfig

View file

80

arch/arm/configs/onearm_defconfig

View file

175

arch/arm/configs/pcontrol_g20_defconfig

View file

242

arch/arm/configs/picotux200_defconfig

View file

137

arch/arm/configs/yl9200_defconfig

View file

2

arch/arm/include/asm/assembler.h

View file

13

arch/arm/include/asm/hardware/cache-l2x0.h

View file

2

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

View file

2

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

View file

6

arch/arm/include/asm/highmem.h

View file

83

arch/arm/include/asm/ioctls.h

View file

5

arch/arm/include/asm/kgdb.h

View file

7

arch/arm/include/asm/memblock.h

View file

4

arch/arm/include/asm/mmu.h

View file

24

arch/arm/include/asm/outercache.h

View file

17

arch/arm/include/asm/pgtable.h

View file

2

arch/arm/kernel/entry-armv.S

View file

1

arch/arm/kernel/etm.c

View file

7

arch/arm/kernel/head.S

View file

3

arch/arm/kernel/hw_breakpoint.c

View file

2

arch/arm/kernel/kgdb.c

View file

3

arch/arm/kernel/machine_kexec.c

View file

2

arch/arm/kernel/perf_event.c

View file

28

arch/arm/kernel/ptrace.c

View file

2

arch/arm/kernel/relocate_kernel.S

View file

2

arch/arm/kernel/stacktrace.c

View file

5

arch/arm/kernel/traps.c

View file

2

arch/arm/kernel/unwind.c

View file

1

arch/arm/kernel/vmlinux.lds.S

View file

6

arch/arm/lib/findbit.S

View file

2

arch/arm/mach-aaec2000/include/mach/vmalloc.h

View file

12

arch/arm/mach-at91/Kconfig

View file

17

arch/arm/mach-at91/Makefile

View file

45

arch/arm/mach-at91/at91rm9200_devices.c

View file

7

arch/arm/mach-at91/at91sam9260.c

View file

7

arch/arm/mach-at91/at91sam9261.c

View file

7

arch/arm/mach-at91/at91sam9263.c

View file

48

arch/arm/mach-at91/at91sam9_alt_reset.S

View file

165

arch/arm/mach-at91/at91sam9g45_devices.c

View file

7

arch/arm/mach-at91/at91sam9rl.c

View file

26

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

View file

21

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

View file

230

arch/arm/mach-at91/board-pcontrol-g20.c

View file

53

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

View file

4

arch/arm/mach-at91/board-dk.c → arch/arm/mach-at91/board-rm9200dk.c

View file

4

arch/arm/mach-at91/board-ek.c → arch/arm/mach-at91/board-rm9200ek.c

View file

24

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

View file

82

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

View file

2

arch/arm/mach-at91/board-yl-9200.c

View file

2

arch/arm/mach-at91/clock.c

View file

3

arch/arm/mach-at91/generic.h

View file

2

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

View file

6

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

View file

7

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

View file

15

arch/arm/mach-at91/pm.c

View file

5

arch/arm/mach-at91/pm.h

View file

1

arch/arm/mach-at91/pm_slowclock.S

View file

2

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

View file

2

arch/arm/mach-clps711x/include/mach/vmalloc.h

View file

2

arch/arm/mach-cns3xxx/pcie.c

View file

76

arch/arm/mach-davinci/Kconfig

View file

4

arch/arm/mach-davinci/Makefile

View file

133

arch/arm/mach-davinci/aemif.c

View file

24

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

View file

92

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

View file

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