Merge branch 'next-samsung-devel' into next-samsung-devel-2

Browse source

Conflicts:
	arch/arm/mach-exynos4/clock.c
	arch/arm/mach-s3c2412/gpio.c
	arch/arm/mach-s5p64x0/dma.c
	arch/arm/mach-s5p64x0/gpiolib.c

...

This commit is contained in:

Kukjin Kim 2011-10-04 20:18:36 +09:00

parent c9477f38cb 568f0e278c

commit db3c94a7ed

136 changed files with 7680 additions and 5607 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

3

arch/arm/Kconfig

View file

4

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

View file

35

arch/arm/mach-exynos4/Kconfig

View file

220

arch/arm/mach-exynos4/clock.c

View file

2

arch/arm/mach-exynos4/cpu.c

View file

300

arch/arm/mach-exynos4/dma.c

View file

4

arch/arm/mach-exynos4/include/mach/dma.h

View file

16

arch/arm/mach-exynos4/include/mach/i2c-hdmiphy.h

View file

4

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

View file

12

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

View file

8

arch/arm/mach-exynos4/include/mach/pm-core.h

View file

7

arch/arm/mach-exynos4/include/mach/pmu.h

View file

74

arch/arm/mach-exynos4/include/mach/regs-pmu.h

View file

34

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

View file

579

arch/arm/mach-exynos4/mach-origen.c

View file

49

arch/arm/mach-exynos4/mach-smdkv310.c

View file

312

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

View file

7

arch/arm/mach-exynos4/pm.c

View file

353

arch/arm/mach-exynos4/pmu.c

View file

1

arch/arm/mach-s3c2410/Kconfig

View file

20

arch/arm/mach-s3c2410/include/mach/dma.h

View file

99

arch/arm/mach-s3c2410/include/mach/gpio-fns.h

View file

6

arch/arm/mach-s3c2410/include/mach/gpio-track.h

View file

2

arch/arm/mach-s3c2410/include/mach/pm-core.h

View file

1

arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h

View file

4

arch/arm/mach-s3c2410/s3c2410.c

View file

4

arch/arm/mach-s3c2412/dma.c

View file

62

arch/arm/mach-s3c2412/gpio.c

View file

1

arch/arm/mach-s3c2416/Kconfig

View file

28

arch/arm/mach-s3c2416/clock.c

View file

4

arch/arm/mach-s3c2416/s3c2416.c

View file

2

arch/arm/mach-s3c2440/Kconfig

View file

4

arch/arm/mach-s3c2440/s3c2440.c

View file

4

arch/arm/mach-s3c2440/s3c2442.c

View file

1

arch/arm/mach-s3c2443/Kconfig

View file

55

arch/arm/mach-s3c2443/clock.c

View file

4

arch/arm/mach-s3c2443/s3c2443.c

View file

1

arch/arm/mach-s3c64xx/Kconfig

View file

3

arch/arm/mach-s3c64xx/Makefile

View file

8

arch/arm/mach-s3c64xx/clock.c

View file

12

arch/arm/mach-s3c64xx/dma.c

View file

290

arch/arm/mach-s3c64xx/gpiolib.c

View file

23

arch/arm/mach-s3c64xx/include/mach/crag6410.h

View file

8

arch/arm/mach-s3c64xx/include/mach/dma.h

View file

2

arch/arm/mach-s3c64xx/include/mach/pm-core.h

View file

3

arch/arm/mach-s3c64xx/include/mach/regs-sys.h

View file

182

arch/arm/mach-s3c64xx/mach-crag6410-module.c

View file

106

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

View file

4

arch/arm/mach-s3c64xx/pm.c

View file

14

arch/arm/mach-s5p64x0/Kconfig

View file

3

arch/arm/mach-s5p64x0/Makefile

View file

10

arch/arm/mach-s5p64x0/clock-s5p6440.c

View file

10

arch/arm/mach-s5p64x0/clock-s5p6450.c

View file

3

arch/arm/mach-s5p64x0/cpu.c

View file

269

arch/arm/mach-s5p64x0/dma.c

View file

4

arch/arm/mach-s5p64x0/include/mach/dma.h

View file

4

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

View file

3

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

View file

4

arch/arm/mach-s5p64x0/include/mach/regs-gpio.h

View file

74

arch/arm/mach-s5p64x0/mach-smdk6440.c

View file

75

arch/arm/mach-s5p64x0/mach-smdk6450.c

View file

29

arch/arm/mach-s5p64x0/setup-fb-24bpp.c

View file

2

arch/arm/mach-s5pc100/Kconfig

View file

15

arch/arm/mach-s5pc100/clock.c

View file

324

arch/arm/mach-s5pc100/dma.c

View file

4

arch/arm/mach-s5pc100/include/mach/dma.h

View file

4

arch/arm/mach-s5pv210/Kconfig

View file

151

arch/arm/mach-s5pv210/clock.c

View file

4

arch/arm/mach-s5pv210/cpu.c

View file

317

arch/arm/mach-s5pv210/dma.c

View file

4

arch/arm/mach-s5pv210/include/mach/dma.h

View file

16

arch/arm/mach-s5pv210/include/mach/i2c-hdmiphy.h

View file

4

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

View file

13

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

View file

2

arch/arm/mach-s5pv210/include/mach/pm-core.h

View file

3

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

View file

62

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

View file

1

arch/arm/plat-s3c24xx/Kconfig

View file

2

arch/arm/plat-s3c24xx/Makefile

View file

10

arch/arm/plat-s3c24xx/dma.c

View file

96

arch/arm/plat-s3c24xx/gpio.c

View file

229

arch/arm/plat-s3c24xx/gpiolib.c

View file

57

arch/arm/plat-s3c24xx/s3c2443-clock.c

View file

13

arch/arm/plat-s5p/Kconfig

View file

2

arch/arm/plat-s5p/Makefile

View file

59

arch/arm/plat-s5p/dev-i2c-hdmiphy.c

View file

98

arch/arm/plat-s5p/dev-tv.c

View file

14

arch/arm/plat-s5p/include/plat/pll.h

View file

10

arch/arm/plat-s5p/irq-gpioint.c

View file

36

arch/arm/plat-samsung/Kconfig

View file

6

arch/arm/plat-samsung/Makefile

View file

131

arch/arm/plat-samsung/dma-ops.c

View file

431

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

View file

167

arch/arm/plat-samsung/gpio.c

View file

6

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

View file

63

arch/arm/plat-samsung/include/plat/dma-ops.h

View file

24

arch/arm/plat-samsung/include/plat/s3c-dma-pl330.h → arch/arm/plat-samsung/include/plat/dma-pl330.h

View file

2

arch/arm/plat-samsung/include/plat/dma-s3c24xx.h

View file

10

arch/arm/plat-samsung/include/plat/dma.h

View file

7

arch/arm/plat-samsung/include/plat/fb.h

View file

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