Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Browse source

Conflicts:
	arch/sparc/kernel/leon_smp.c

Merge mainline to get the nobootmem.c bug fix, for the sake
of the sparc64 NO_BOOTMEM conversion.

Resolve a small include line conflict in leon_smp.c

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2012-04-26 20:00:35 -07:00

parent df2e7f525d 82b7690635

commit 8fe5f56c8a

464 changed files with 7982 additions and 6381 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

18

Documentation/ABI/testing/sysfs-block-rssd

View file

19

Documentation/ABI/testing/sysfs-bus-hsi

View file

8

Documentation/ABI/testing/sysfs-cfq-target-latency

View file

2

Documentation/DocBook/media/v4l/pixfmt-nv12m.xml

View file

2

Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml

View file

4

Documentation/sound/alsa/HD-Audio-Models.txt

View file

9

MAINTAINERS

View file

2

Makefile

View file

68

arch/alpha/include/asm/atomic.h

View file

71

arch/alpha/include/asm/cmpxchg.h

View file

4

arch/alpha/include/asm/xchg.h

View file

2

arch/arm/boot/compressed/atags_to_fdt.c

View file

2

arch/arm/boot/compressed/head.S

View file

1

arch/arm/boot/dts/at91sam9g20.dtsi

View file

1

arch/arm/boot/dts/at91sam9g45.dtsi

View file

1

arch/arm/boot/dts/at91sam9x5.dtsi

View file

1

arch/arm/boot/dts/db8500.dtsi

View file

1

arch/arm/boot/dts/highbank.dts

View file

9

arch/arm/common/vic.c

View file

1

arch/arm/configs/imx_v4_v5_defconfig

View file

9

arch/arm/configs/u8500_defconfig

View file

2

arch/arm/include/asm/jump_label.h

View file

16

arch/arm/kernel/setup.c

View file

1

arch/arm/mach-at91/at91rm9200_devices.c

View file

2

arch/arm/mach-at91/at91rm9200_time.c

View file

2

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

View file

5

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

View file

1

arch/arm/mach-at91/clock.c

View file

2

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

View file

2

arch/arm/mach-at91/setup.c

View file

4

arch/arm/mach-bcmring/core.c

View file

2

arch/arm/mach-exynos/Kconfig

View file

2

arch/arm/mach-exynos/include/mach/irqs.h

View file

4

arch/arm/mach-exynos/include/mach/map.h

View file

6

arch/arm/mach-exynos/include/mach/regs-clock.h

View file

2

arch/arm/mach-exynos/mach-exynos5-dt.c

View file

46

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

View file

2

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

View file

6

arch/arm/mach-imx/imx27-dt.c

View file

2

arch/arm/mach-imx/mm-imx5.c

View file

3

arch/arm/mach-msm/board-halibut.c

View file

1

arch/arm/mach-msm/board-trout-panel.c

View file

1

arch/arm/mach-msm/board-trout.c

View file

2

arch/arm/mach-msm/proc_comm.c

View file

1

arch/arm/mach-omap1/mux.c

View file

4

arch/arm/mach-omap1/timer.c

View file

12

arch/arm/mach-omap2/board-4430sdp.c

View file

2

arch/arm/mach-omap2/board-generic.c

View file

13

arch/arm/mach-omap2/board-omap4panda.c

View file

80

arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c

View file

5

arch/arm/mach-omap2/clock.c

View file

8

arch/arm/mach-omap2/clock.h

View file

17

arch/arm/mach-omap2/omap_hwmod.c

View file

1

arch/arm/mach-omap2/omap_hwmod_2420_data.c

View file

1

arch/arm/mach-omap2/omap_hwmod_2430_data.c

View file

1

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

View file

9

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

View file

124

arch/arm/mach-omap2/serial.c

View file

37

arch/arm/mach-omap2/twl-common.c

View file

10

arch/arm/mach-omap2/twl-common.h

View file

2

arch/arm/mach-s5pv210/dma.c

View file

4

arch/arm/mach-s5pv210/mach-aquila.c

View file

4

arch/arm/mach-s5pv210/mach-goni.c

View file

1

arch/arm/mach-ux500/Kconfig

View file

2

arch/arm/mach-ux500/mbox-db5500.c

View file

2

arch/arm/mach-ux500/platsmp.c

View file

2

arch/arm/mm/Kconfig

View file

2

arch/arm/mm/fault.c

View file

2

arch/arm/mm/nommu.c

View file

12

arch/arm/mm/proc-v7.S

View file

26

arch/arm/plat-omap/clock.c

View file

10

arch/arm/plat-omap/include/plat/clock.h

View file

4

arch/arm/plat-omap/include/plat/omap_hwmod.h

View file

12

arch/arm/plat-omap/sram.c

View file

1

arch/arm/plat-samsung/Kconfig

View file

1

arch/hexagon/kernel/dma.c

View file

6

arch/hexagon/kernel/process.c

View file

1

arch/hexagon/kernel/ptrace.c

View file

8

arch/hexagon/kernel/smp.c

View file

1

arch/hexagon/kernel/time.c

View file

1

arch/hexagon/kernel/vdso.c

View file

148

arch/ia64/include/asm/cmpxchg.h

View file

9

arch/ia64/include/asm/futex.h

View file

114

arch/ia64/include/asm/intrinsics.h

View file

18

arch/ia64/kernel/perfmon.c

View file

1

arch/m68k/configs/m5275evb_defconfig

View file

2

arch/m68k/platform/527x/config.c

View file

6

arch/m68k/platform/68EZ328/Makefile

View file

9

arch/m68k/platform/68VZ328/Makefile

View file

2

arch/m68k/platform/68EZ328/bootlogo.h → arch/m68k/platform/68VZ328/bootlogo.h

View file

2

arch/m68k/platform/coldfire/device.c

View file

43

arch/powerpc/boot/dts/fsl/pq3-mpic-message-B.dtsi

View file

10

arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi

View file

18

arch/powerpc/include/asm/mpic.h

View file

1

arch/powerpc/include/asm/mpic_msgr.h

View file

5

arch/powerpc/include/asm/reg_booke.h

View file

3

arch/powerpc/kernel/setup_32.c

View file

6

arch/powerpc/platforms/85xx/common.c

View file

11

arch/powerpc/platforms/85xx/mpc85xx_mds.c

View file

13

arch/powerpc/platforms/85xx/p1022_ds.c

View file

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