Merge commit 'v2.6.37-rc4' into imx-for-2.6.38

Browse source

Done to resolve merge conflict:

Conflicts:
	arch/arm/mach-mx25/devices-imx25.h

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

...

This commit is contained in:

Sascha Hauer 2010-12-06 09:36:17 +01:00

parent 96886c4361 e8a7e48bb2

commit 0e44e05958

351 changed files with 10754 additions and 3115 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

4

Documentation/DocBook/sh.tmpl

View file

8

Documentation/edac.txt

View file

32

Documentation/fb/00-INDEX

View file

5

Documentation/kernel-parameters.txt

View file

1

Documentation/networking/ip-sysctl.txt

View file

32

Documentation/sh/clk.txt

View file

8

MAINTAINERS

View file

2

Makefile

View file

2

arch/arm/boot/compressed/head.S

View file

2

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

View file

2

arch/arm/include/asm/assembler.h

View file

4

arch/arm/include/asm/mmu.h

View file

3

arch/arm/include/asm/pgtable.h

View file

6

arch/arm/lib/findbit.S

View file

2

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

View file

2

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

View file

2

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

View file

6

arch/arm/mach-davinci/dm355.c

View file

6

arch/arm/mach-davinci/dm365.c

View file

4

arch/arm/mach-davinci/dm644x.c

View file

2

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

View file

2

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

View file

2

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

View file

2

arch/arm/mach-imx/devices-imx25.h

View file

6

arch/arm/mach-imx/eukrea_mbimx27-baseboard.c

View file

2

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

View file

2

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

View file

3

arch/arm/mach-mx3/mach-pcm037_eet.c

View file

2

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

View file

2

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

View file

2

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

View file

7

arch/arm/mach-omap2/pm24xx.c

View file

10

arch/arm/mach-omap2/pm34xx.c

View file

7

arch/arm/mach-omap2/serial.c

View file

2

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

View file

2

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

View file

8

arch/arm/mach-s3c2410/h1940-bluetooth.c

View file

5

arch/arm/mach-s3c2416/irq.c

View file

5

arch/arm/mach-s3c2443/irq.c

View file

2

arch/arm/mach-s3c64xx/mach-mini6410.c

View file

2

arch/arm/mach-s3c64xx/mach-real6410.c

View file

1

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

View file

1

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

View file

2

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

View file

147

arch/arm/mach-shmobile/board-ap4evb.c

View file

39

arch/arm/mach-shmobile/clock-sh7372.c

View file

6

arch/arm/mach-ux500/cpu.c

View file

2

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

View file

4

arch/arm/mm/ioremap.c

View file

8

arch/arm/plat-mxc/devices/platform-imx-dma.c

View file

1

arch/arm/plat-mxc/devices/platform-spi_imx.c

View file

89

arch/arm/plat-nomadik/timer.c

View file

3

arch/arm/plat-pxa/include/plat/sdhci.h

View file

6

arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c

View file

6

arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c

View file

6

arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c

View file

2

arch/powerpc/mm/pgtable.c

View file

10

arch/s390/kernel/nmi.c

View file

14

arch/s390/lib/delay.c

View file

7

arch/sh/include/asm/processor_32.h

View file

2

arch/sh/kernel/cpu/sh4/clock-sh4-202.c

View file

2

arch/sh/kernel/sys_sh.c

View file

2

arch/sh/kernel/vsyscall/vsyscall-trapa.S

View file

12

arch/tile/Kconfig

View file

52

arch/tile/include/asm/cacheflush.h

View file

15

arch/tile/include/asm/io.h

View file

117

arch/tile/include/asm/pci-bridge.h

View file

107

arch/tile/include/asm/pci.h

View file

10

arch/tile/include/asm/processor.h

View file

300

arch/tile/include/hv/drv_xgbe_impl.h

View file

615

arch/tile/include/hv/drv_xgbe_intf.h

View file

122

arch/tile/include/hv/netio_errors.h

View file

2975

arch/tile/include/hv/netio_intf.h

View file

1

arch/tile/kernel/Makefile

View file

621

arch/tile/kernel/pci.c

View file

2

arch/tile/kernel/setup.c

View file

35

arch/tile/lib/memchr_32.c

View file

31

arch/tile/lib/spinlock_32.c

View file

5

arch/um/drivers/line.c

View file

2

arch/x86/Kconfig

View file

4

arch/x86/include/asm/fixmap.h

View file

2

arch/x86/include/asm/msr-index.h

View file

10

arch/x86/include/asm/paravirt.h

View file

4

arch/x86/include/asm/uv/uv_hub.h

View file

19

arch/x86/include/asm/uv/uv_mmrs.h

View file

6

arch/x86/include/asm/xen/interface.h

View file

5

arch/x86/include/asm/xen/interface_32.h

View file

13

arch/x86/include/asm/xen/interface_64.h

View file

7

arch/x86/include/asm/xen/page.h

View file

7

arch/x86/kernel/apic/hw_nmi.c

View file

25

arch/x86/kernel/apic/x2apic_uv_x.c

View file

20

arch/x86/kernel/cpu/perf_event.c

View file

2

arch/x86/kernel/entry_32.S

View file

2

arch/x86/kernel/entry_64.S

View file

4

arch/x86/kernel/hw_breakpoint.c

View file

64

arch/x86/kernel/mmconf-fam10h_64.c

View file

5

arch/x86/mm/tlb.c

View file

2

arch/x86/platform/uv/tlb_uv.c

View file

4

arch/x86/platform/uv/uv_time.c

View file

21

arch/x86/xen/enlighten.c

View file

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