kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-09-28 19:20:30 +00:00
Code Issues Releases Packages Activity

Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable

Browse source 
Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile
This commit is contained in:
Russell King 2010-03-02 23:40:15 +00:00
commit 882d01f96b
333 changed files with 20689 additions and 14361 deletions
Download patch file Download diff file Expand all files Collapse all files

50
arch/arm/Kconfig
View file

2
arch/arm/Kconfig.debug
View file

14
arch/arm/Makefile
View file

362
arch/arm/configs/s3c6400_defconfig
View file

883
arch/arm/configs/s5p6442_defconfig
View file

894
arch/arm/configs/s5pc110_defconfig
View file

894
arch/arm/configs/s5pv210_defconfig
View file

2
arch/arm/mach-s3c2410/dma.c
View file

2
arch/arm/plat-s3c24xx/include/plat/pm-core.h → arch/arm/mach-s3c2410/include/mach/pm-core.h
View file

10
arch/arm/mach-s3c2410/include/mach/regs-gpio.h
View file

2
arch/arm/plat-s3c/include/mach/timex.h → arch/arm/mach-s3c2410/include/mach/timex.h
View file

2
arch/arm/plat-s3c/include/mach/vmalloc.h → arch/arm/mach-s3c2410/include/mach/vmalloc.h
View file

2
arch/arm/mach-s3c2412/dma.c
View file

74
arch/arm/mach-s3c2440/Kconfig
View file

11
arch/arm/mach-s3c2440/Makefile
View file

2
arch/arm/mach-s3c2440/dma.c
View file

2
arch/arm/mach-s3c2440/dsc.c
View file

0
arch/arm/mach-s3c2442/include/mach/gta02.h → arch/arm/mach-s3c2440/include/mach/gta02.h
View file

0
arch/arm/mach-s3c2442/mach-gta02.c → arch/arm/mach-s3c2440/mach-gta02.c
View file

2
arch/arm/mach-s3c2440/mach-nexcoder.c
View file

2
arch/arm/mach-s3c2440/mach-smdk2440.c
View file

2
arch/arm/mach-s3c2440/s3c2440.c
View file

16
arch/arm/mach-s3c2442/clock.c → arch/arm/mach-s3c2440/s3c2442.c
View file

0
arch/arm/plat-s3c24xx/s3c244x-clock.c → arch/arm/mach-s3c2440/s3c244x-clock.c
View file

0
arch/arm/plat-s3c24xx/s3c244x-irq.c → arch/arm/mach-s3c2440/s3c244x-irq.c
View file

3
arch/arm/plat-s3c24xx/s3c244x.c → arch/arm/mach-s3c2440/s3c244x.c
View file

37
arch/arm/mach-s3c2442/Kconfig
View file

18
arch/arm/mach-s3c2442/Makefile
View file

34
arch/arm/mach-s3c2442/s3c2442.c
View file

2
arch/arm/mach-s3c2443/dma.c
View file

10
arch/arm/mach-s3c2443/mach-smdk2443.c
View file

4
arch/arm/plat-s3c/include/mach/io.h → arch/arm/mach-s3c24a0/include/mach/io.h
View file

30
arch/arm/mach-s3c6400/Kconfig
View file

23
arch/arm/mach-s3c6400/Makefile
View file

70
arch/arm/mach-s3c6400/include/mach/dma.h
View file

16
arch/arm/mach-s3c6400/include/mach/irqs.h
View file

16
arch/arm/mach-s3c6400/include/mach/regs-clock.h
View file

26
arch/arm/mach-s3c6410/Makefile
View file

68
arch/arm/mach-s3c6410/setup-sdhci.c
View file

87
arch/arm/mach-s3c6410/Kconfig → arch/arm/mach-s3c64xx/Kconfig
View file

56
arch/arm/plat-s3c64xx/Makefile → arch/arm/mach-s3c64xx/Makefile
View file

0
arch/arm/mach-s3c6400/Makefile.boot → arch/arm/mach-s3c64xx/Makefile.boot
View file

311
arch/arm/plat-s3c64xx/s3c6400-clock.c → arch/arm/mach-s3c64xx/clock.c
View file

10
arch/arm/plat-s3c64xx/cpu.c → arch/arm/mach-s3c64xx/cpu.c
View file

0
arch/arm/plat-s3c64xx/cpufreq.c → arch/arm/mach-s3c64xx/cpufreq.c
View file

0
arch/arm/plat-s3c64xx/dev-adc.c → arch/arm/mach-s3c64xx/dev-adc.c
View file

87
arch/arm/plat-s3c64xx/dev-audio.c → arch/arm/mach-s3c64xx/dev-audio.c
View file

0
arch/arm/plat-s3c64xx/dev-rtc.c → arch/arm/mach-s3c64xx/dev-rtc.c
View file

5
arch/arm/plat-s3c64xx/dev-spi.c → arch/arm/mach-s3c64xx/dev-spi.c
View file

0
arch/arm/plat-s3c64xx/dev-uart.c → arch/arm/mach-s3c64xx/dev-uart.c
View file

3
arch/arm/plat-s3c64xx/dma.c → arch/arm/mach-s3c64xx/dma.c
View file

2
arch/arm/plat-s3c64xx/gpiolib.c → arch/arm/mach-s3c64xx/gpiolib.c
View file

0
arch/arm/mach-s3c6400/include/mach/debug-macro.S → arch/arm/mach-s3c64xx/include/mach/debug-macro.S
View file

79
arch/arm/plat-s3c64xx/include/plat/dma-plat.h → arch/arm/mach-s3c64xx/include/mach/dma.h
View file

2
arch/arm/mach-s3c6400/include/mach/entry-macro.S → arch/arm/mach-s3c64xx/include/mach/entry-macro.S
View file

2
arch/arm/plat-s3c64xx/include/plat/gpio-bank-a.h → arch/arm/mach-s3c64xx/include/mach/gpio-bank-a.h
View file

2
arch/arm/plat-s3c64xx/include/plat/gpio-bank-b.h → arch/arm/mach-s3c64xx/include/mach/gpio-bank-b.h
View file

2
arch/arm/plat-s3c64xx/include/plat/gpio-bank-c.h → arch/arm/mach-s3c64xx/include/mach/gpio-bank-c.h
View file

2
arch/arm/plat-s3c64xx/include/plat/gpio-bank-d.h → arch/arm/mach-s3c64xx/include/mach/gpio-bank-d.h
View file

2
arch/arm/plat-s3c64xx/include/plat/gpio-bank-e.h → arch/arm/mach-s3c64xx/include/mach/gpio-bank-e.h
View file

2
arch/arm/plat-s3c64xx/include/plat/gpio-bank-f.h → arch/arm/mach-s3c64xx/include/mach/gpio-bank-f.h
View file

2
arch/arm/plat-s3c64xx/include/plat/gpio-bank-g.h → arch/arm/mach-s3c64xx/include/mach/gpio-bank-g.h
View file

2
arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h → arch/arm/mach-s3c64xx/include/mach/gpio-bank-h.h
View file

2
arch/arm/plat-s3c64xx/include/plat/gpio-bank-i.h → arch/arm/mach-s3c64xx/include/mach/gpio-bank-i.h
View file

2
arch/arm/plat-s3c64xx/include/plat/gpio-bank-j.h → arch/arm/mach-s3c64xx/include/mach/gpio-bank-j.h
View file

2
arch/arm/plat-s3c64xx/include/plat/gpio-bank-n.h → arch/arm/mach-s3c64xx/include/mach/gpio-bank-n.h
View file

2
arch/arm/plat-s3c64xx/include/plat/gpio-bank-o.h → arch/arm/mach-s3c64xx/include/mach/gpio-bank-o.h
View file

2
arch/arm/plat-s3c64xx/include/plat/gpio-bank-p.h → arch/arm/mach-s3c64xx/include/mach/gpio-bank-p.h
View file

2
arch/arm/plat-s3c64xx/include/plat/gpio-bank-q.h → arch/arm/mach-s3c64xx/include/mach/gpio-bank-q.h
View file

6
arch/arm/mach-s3c6400/include/mach/gpio.h → arch/arm/mach-s3c64xx/include/mach/gpio.h
View file

0
arch/arm/mach-s3c6400/include/mach/hardware.h → arch/arm/mach-s3c64xx/include/mach/hardware.h
View file

18
arch/arm/mach-s3c64xx/include/mach/io.h
View file

12
arch/arm/plat-s3c64xx/include/plat/irqs.h → arch/arm/mach-s3c64xx/include/mach/irqs.h
View file

0
arch/arm/mach-s3c6400/include/mach/map.h → arch/arm/mach-s3c64xx/include/mach/map.h
View file

0
arch/arm/mach-s3c6400/include/mach/memory.h → arch/arm/mach-s3c64xx/include/mach/memory.h
View file

0
arch/arm/plat-s3c64xx/include/plat/pll.h → arch/arm/mach-s3c64xx/include/mach/pll.h
View file

4
arch/arm/plat-s3c64xx/include/plat/pm-core.h → arch/arm/mach-s3c64xx/include/mach/pm-core.h
View file

0
arch/arm/mach-s3c6400/include/mach/pwm-clock.h → arch/arm/mach-s3c64xx/include/mach/pwm-clock.h
View file

0
arch/arm/plat-s3c64xx/include/plat/regs-clock.h → arch/arm/mach-s3c64xx/include/mach/regs-clock.h
View file

0
arch/arm/mach-s3c6400/include/mach/regs-fb.h → arch/arm/mach-s3c64xx/include/mach/regs-fb.h
View file

0
arch/arm/plat-s3c64xx/include/plat/regs-gpio-memport.h → arch/arm/mach-s3c64xx/include/mach/regs-gpio-memport.h
View file

0
arch/arm/plat-s3c64xx/include/plat/regs-gpio.h → arch/arm/mach-s3c64xx/include/mach/regs-gpio.h
View file

0
arch/arm/mach-s3c6400/include/mach/regs-irq.h → arch/arm/mach-s3c64xx/include/mach/regs-irq.h
View file

0
arch/arm/plat-s3c64xx/include/plat/regs-modem.h → arch/arm/mach-s3c64xx/include/mach/regs-modem.h
View file

0
arch/arm/plat-s3c64xx/include/plat/regs-srom.h → arch/arm/mach-s3c64xx/include/mach/regs-srom.h
View file

0
arch/arm/plat-s3c64xx/include/plat/regs-sys.h → arch/arm/mach-s3c64xx/include/mach/regs-sys.h
View file

0
arch/arm/plat-s3c64xx/include/plat/regs-syscon-power.h → arch/arm/mach-s3c64xx/include/mach/regs-syscon-power.h
View file

6
arch/arm/plat-s3c64xx/include/plat/s3c6400.h → arch/arm/mach-s3c64xx/include/mach/s3c6400.h
View file

2
arch/arm/plat-s3c64xx/include/plat/s3c6410.h → arch/arm/mach-s3c64xx/include/mach/s3c6410.h
View file

2
arch/arm/plat-s3c64xx/include/plat/spi-clocks.h → arch/arm/mach-s3c64xx/include/mach/spi-clocks.h
View file

0
arch/arm/mach-s3c6400/include/mach/system.h → arch/arm/mach-s3c64xx/include/mach/system.h
View file

0
arch/arm/mach-s3c6400/include/mach/tick.h → arch/arm/mach-s3c64xx/include/mach/tick.h
View file

24
arch/arm/mach-s3c64xx/include/mach/timex.h
View file

0
arch/arm/mach-s3c6400/include/mach/uncompress.h → arch/arm/mach-s3c64xx/include/mach/uncompress.h
View file

20
arch/arm/mach-s3c64xx/include/mach/vmalloc.h
View file

2
arch/arm/plat-s3c64xx/irq-eint.c → arch/arm/mach-s3c64xx/irq-eint.c
View file

2
arch/arm/plat-s3c64xx/irq-pm.c → arch/arm/mach-s3c64xx/irq-pm.c
View file

0
arch/arm/plat-s3c64xx/irq.c → arch/arm/mach-s3c64xx/irq.c
View file

8
arch/arm/mach-s3c6410/mach-anw6410.c → arch/arm/mach-s3c64xx/mach-anw6410.c
View file

2
arch/arm/mach-s3c6410/mach-hmt.c → arch/arm/mach-s3c64xx/mach-hmt.c
View file

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