Arnd Bergmann 3e965b1763 Merge branch 'next/fixes' into next/cleanup ...

Conflicts:
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/plat-mxc/include/mach/gpio.h
	drivers/video/omap/lcd_apollon.c
	drivers/video/omap/lcd_ldp.c
	drivers/video/omap/lcd_overo.c

2011-10-31 23:25:41 +01:00

..

include/mach

Merge branch 'depends/rmk/memory_h' into next/fixes

2011-10-31 23:11:53 +01:00

clock.c

ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver

2011-09-27 07:00:53 +09:00

cpu.c

ARM: mach-s5pv210: Setup consistent dma size at boot time

2011-08-22 12:00:11 +00:00

dev-audio.c

ARM: SAMSUNG: Add IRQ_I2S0 definition

2011-07-21 17:27:28 +09:00

dev-spi.c

ARM: SAMSUNG: Add tx_st_done variable

2011-07-06 15:03:08 +09:00

dma.c

ARM: S5P: Reorder DMA platform device id

2010-10-25 16:10:47 +09:00

init.c

ARM: S5PV210: Add Samsung S5PV210 CPU support

2010-02-24 22:47:21 +00:00

Kconfig

ARM: S5PV210: Remove unnecessary symbol for PM

2011-09-16 15:42:47 +09:00

mach-aquila.c

ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset

2011-08-21 17:15:12 -04:00

mach-goni.c

ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset

2011-08-21 17:15:12 -04:00

mach-smdkc110.c

ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset

2011-08-21 17:15:12 -04:00

mach-smdkv210.c

Merge branch 'depends/rmk/devel-stable' into next/cleanup

2011-10-08 21:07:42 +02:00

mach-torbreck.c

ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset

2011-08-21 17:15:12 -04:00

Makefile

ARM: S5PV210: Remove unnecessary symbol for PM

2011-09-16 15:42:47 +09:00

Makefile.boot

ARM: S5PV210: Add Samsung S5PV210 CPU support

2010-02-24 22:47:21 +00:00

pm.c

ARM: S5PV210: Fix build warning

2011-08-19 20:57:35 +09:00

setup-fb-24bpp.c

ARM: S5PV210: Cleanup mach/regs-fb.h from mach-s5pv210

2011-07-21 02:11:34 +09:00

setup-fimc.c

ARM: S5P: Add platform helpers for camera GPIO configuration

2011-03-11 15:49:00 +09:00

setup-i2c0.c

ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range()

2010-10-23 11:51:09 +09:00

setup-i2c1.c

ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range()

2010-10-23 11:51:09 +09:00

setup-i2c2.c

ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range()

2010-10-23 11:51:09 +09:00

setup-ide.c

ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull()

2010-10-23 11:52:26 +09:00

setup-keypad.c

ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull()

2010-10-23 11:52:26 +09:00

setup-sdhci-gpio.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

setup-sdhci.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

sleep.S

ARM: pm: samsung: move cpu_suspend into C code

2011-06-24 08:48:44 +01:00