Merge branches 'sh/earlytimer' and 'sh/shmobile-r2r-staging'

Browse source

...

This commit is contained in:

Paul Mundt 2009-04-19 13:08:33 +09:00

parent b8c193f88e 28fde6863e bc9f3d4291

commit 22fd67c5c9

520 changed files with 21343 additions and 16159 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

59

Documentation/driver-model/platform.txt

View file

5

Documentation/filesystems/pohmelfs/design_notes.txt

View file

21

Documentation/filesystems/pohmelfs/info.txt

View file

40

Documentation/kernel-parameters.txt

View file

2

Documentation/networking/bonding.txt

View file

84

MAINTAINERS

View file

9

arch/arm/common/vic.c

View file

826

arch/arm/configs/imx27ads_defconfig

View file

538

arch/arm/configs/mx31ads_defconfig → arch/arm/configs/mx1_defconfig

View file

354

arch/arm/configs/pcm038_defconfig → arch/arm/configs/mx27_defconfig

View file

797

arch/arm/configs/mx31litekit_defconfig → arch/arm/configs/mx3_defconfig

View file

769

arch/arm/configs/pcm037_defconfig

View file

1112

arch/arm/configs/s3c2410_defconfig

View file

25

arch/arm/include/asm/tlb.h

View file

1

arch/arm/kernel/sys_oabi-compat.c

View file

2

arch/arm/mach-ep93xx/core.c

View file

6

arch/arm/mach-mx1/mx1ads.c

View file

8

arch/arm/mach-mx2/clock_imx21.c

View file

2

arch/arm/mach-mx3/Kconfig

View file

4

arch/arm/mach-mx3/mx31ads.c

View file

4

arch/arm/mach-mx3/pcm037.c

View file

28

arch/arm/mach-mx3/qong.c

View file

6

arch/arm/mach-pxa/em-x270.c

View file

3

arch/arm/mach-pxa/generic.h

View file

4

arch/arm/mach-pxa/include/mach/colibri.h

View file

1

arch/arm/mach-pxa/include/mach/palmt5.h

View file

1

arch/arm/mach-pxa/include/mach/palmtx.h

View file

11

arch/arm/mach-pxa/palmt5.c

View file

11

arch/arm/mach-pxa/palmtx.c

View file

5

arch/arm/mach-s3c2412/mach-jive.c

View file

2

arch/arm/mach-s3c2440/mach-anubis.c

View file

1

arch/arm/mach-s3c2440/mach-osiris.c

View file

4

arch/arm/mach-s3c6410/mach-smdk6410.c

View file

2

arch/arm/plat-mxc/include/mach/imx-uart.h

View file

48

arch/arm/plat-mxc/include/mach/iomux-mx3.h

View file

2

arch/arm/plat-mxc/include/mach/irqs.h

View file

3

arch/arm/plat-mxc/include/mach/mx21.h

View file

14

arch/arm/plat-mxc/irq.c

View file

3

arch/arm/plat-s3c/gpio-config.c

View file

1

arch/arm/plat-s3c/include/plat/devs.h

View file

19

arch/arm/plat-s3c24xx/adc.c

View file

2

arch/arm/plat-s3c24xx/gpiolib.c

View file

0

include/asm-h8300/timer.h → arch/h8300/include/asm/timer.h

View file

0

include/asm-m32r/Kbuild → arch/m32r/include/asm/Kbuild

View file

0

include/asm-m32r/addrspace.h → arch/m32r/include/asm/addrspace.h

View file

0

include/asm-m32r/assembler.h → arch/m32r/include/asm/assembler.h

View file

0

include/asm-m32r/atomic.h → arch/m32r/include/asm/atomic.h

View file

0

include/asm-m32r/auxvec.h → arch/m32r/include/asm/auxvec.h

View file

0

include/asm-m32r/bitops.h → arch/m32r/include/asm/bitops.h

View file

0

include/asm-m32r/bug.h → arch/m32r/include/asm/bug.h

View file

0

include/asm-m32r/bugs.h → arch/m32r/include/asm/bugs.h

View file

0

include/asm-m32r/byteorder.h → arch/m32r/include/asm/byteorder.h

View file

0

include/asm-m32r/cache.h → arch/m32r/include/asm/cache.h

View file

0

include/asm-m32r/cachectl.h → arch/m32r/include/asm/cachectl.h

View file

0

include/asm-m32r/cacheflush.h → arch/m32r/include/asm/cacheflush.h

View file

0

include/asm-m32r/checksum.h → arch/m32r/include/asm/checksum.h

View file

0

include/asm-m32r/cputime.h → arch/m32r/include/asm/cputime.h

View file

0

include/asm-m32r/current.h → arch/m32r/include/asm/current.h

View file

0

include/asm-m32r/delay.h → arch/m32r/include/asm/delay.h

View file

0

include/asm-m32r/device.h → arch/m32r/include/asm/device.h

View file

0

include/asm-m32r/div64.h → arch/m32r/include/asm/div64.h

View file

0

include/asm-m32r/dma.h → arch/m32r/include/asm/dma.h

View file

0

include/asm-m32r/elf.h → arch/m32r/include/asm/elf.h

View file

0

include/asm-m32r/emergency-restart.h → arch/m32r/include/asm/emergency-restart.h

View file

0

include/asm-m32r/errno.h → arch/m32r/include/asm/errno.h

View file

0

include/asm-m32r/fb.h → arch/m32r/include/asm/fb.h

View file

0

include/asm-m32r/fcntl.h → arch/m32r/include/asm/fcntl.h

View file

0

include/asm-m32r/flat.h → arch/m32r/include/asm/flat.h

View file

0

include/asm-m32r/ftrace.h → arch/m32r/include/asm/ftrace.h

View file

0

include/asm-m32r/futex.h → arch/m32r/include/asm/futex.h

View file

0

include/asm-m32r/hardirq.h → arch/m32r/include/asm/hardirq.h

View file

0

include/asm-m32r/hw_irq.h → arch/m32r/include/asm/hw_irq.h

View file

0

include/asm-m32r/io.h → arch/m32r/include/asm/io.h

View file

0

include/asm-m32r/ioctl.h → arch/m32r/include/asm/ioctl.h

View file

0

include/asm-m32r/ioctls.h → arch/m32r/include/asm/ioctls.h

View file

0

include/asm-m32r/ipcbuf.h → arch/m32r/include/asm/ipcbuf.h

View file

0

include/asm-m32r/irq.h → arch/m32r/include/asm/irq.h

View file

0

include/asm-m32r/irq_regs.h → arch/m32r/include/asm/irq_regs.h

View file

0

include/asm-m32r/kdebug.h → arch/m32r/include/asm/kdebug.h

View file

0

include/asm-m32r/kmap_types.h → arch/m32r/include/asm/kmap_types.h

View file

0

include/asm-m32r/linkage.h → arch/m32r/include/asm/linkage.h

View file

0

include/asm-m32r/local.h → arch/m32r/include/asm/local.h

View file

0

include/asm-m32r/m32102.h → arch/m32r/include/asm/m32102.h

View file

0

include/asm-m32r/m32104ut/m32104ut_pld.h → arch/m32r/include/asm/m32104ut/m32104ut_pld.h

View file

0

include/asm-m32r/m32700ut/m32700ut_lan.h → arch/m32r/include/asm/m32700ut/m32700ut_lan.h

View file

0

include/asm-m32r/m32700ut/m32700ut_lcd.h → arch/m32r/include/asm/m32700ut/m32700ut_lcd.h

View file

0

include/asm-m32r/m32700ut/m32700ut_pld.h → arch/m32r/include/asm/m32700ut/m32700ut_pld.h

View file

0

include/asm-m32r/m32r.h → arch/m32r/include/asm/m32r.h

View file

0

include/asm-m32r/m32r_mp_fpga.h → arch/m32r/include/asm/m32r_mp_fpga.h

View file

0

include/asm-m32r/mappi2/mappi2_pld.h → arch/m32r/include/asm/mappi2/mappi2_pld.h

View file

0

include/asm-m32r/mappi3/mappi3_pld.h → arch/m32r/include/asm/mappi3/mappi3_pld.h

View file

0

include/asm-m32r/mc146818rtc.h → arch/m32r/include/asm/mc146818rtc.h

View file

0

include/asm-m32r/mman.h → arch/m32r/include/asm/mman.h

View file

0

include/asm-m32r/mmu.h → arch/m32r/include/asm/mmu.h

View file

0

include/asm-m32r/mmu_context.h → arch/m32r/include/asm/mmu_context.h

View file

0

include/asm-m32r/mmzone.h → arch/m32r/include/asm/mmzone.h

View file

0

include/asm-m32r/module.h → arch/m32r/include/asm/module.h

View file

0

include/asm-m32r/msgbuf.h → arch/m32r/include/asm/msgbuf.h

View file

0

include/asm-m32r/mutex.h → arch/m32r/include/asm/mutex.h

View file

0

include/asm-m32r/opsput/opsput_lan.h → arch/m32r/include/asm/opsput/opsput_lan.h

View file

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