Arnd Bergmann bde755679a Merge branch 'samsung/cleanup-exynos-clock' into next/soc ...

Conflicts:
	arch/arm/mach-exynos/clock-exynos4.c
	arch/arm/mach-exynos/clock.c

The cleanup moves the exynos4 clock implementation away, while
the other branch modifies the file with the old name.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-03-20 10:07:48 +00:00

..

include/mach

Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc

2012-03-10 09:51:26 -08:00

clock.c

ARM: S5PV210: Fix the name of exynos4_clk_hdmiphy_ctrl() for S5PV210

2012-01-27 15:02:29 +09:00

common.c

ARM: mach-s5pv210: use standard arch_idle()

2012-01-20 18:55:07 -05:00

common.h

ARM: 7252/1: restart: S5PV210: use new restart hook

2012-01-05 12:57:19 +00:00

dev-audio.c

ARM: SAMSUNG: Add IRQ_I2S0 definition

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

dma.c

Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static

2012-03-07 03:34:41 -08:00

Kconfig

ARM: S5PV210: Add usb otg phy control

2012-03-09 07:31:34 -08:00

mach-aquila.c

Merge branch 'samsung/dt' into samsung/cleanup

2012-01-09 16:01:00 +00:00

mach-goni.c

ARM: S5PV210: use static declaration when it is not used in other files

2012-01-21 13:06:18 +09:00

mach-smdkc110.c

Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2012-01-07 12:03:30 -08:00

mach-smdkv210.c

ARM: S5PV210: use static declaration when it is not used in other files

2012-01-21 13:06:18 +09:00

mach-torbreck.c

Merge branch 'restart' into for-linus

2012-01-05 13:25:27 +00:00

Makefile

ARM: S5PV210: Add usb otg phy control

2012-03-09 07:31:34 -08:00

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

2011-10-17 09:12:40 +01:00

pm.c

ARM: SAMSUNG: Fix missing api-change from subsys_interface change

2012-01-27 15:35:47 +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-spi.c

ARM: S5PV210: Modified files for SPI consolidation work

2011-12-23 10:50:03 +09:00

setup-usb-phy.c

ARM: S5PV210: Add usb otg phy control

2012-03-09 07:31:34 -08:00