alistair23-linux/arch/arm/mach-s3c64xx
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 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
clock.c 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
common.c ARM: S3C64XX: Make s3c64xx_init_uarts() static 2012-01-27 14:41:20 +09:00
common.h ARM: S3C64XX: use static declaration when it is not used in other files 2012-01-21 12:02:31 +09:00
cpuidle.c ARM: S3C64XX: Reduce residency requirement for cpuidle WFI mode 2012-02-11 08:02:43 +09:00
dev-audio.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
dev-uart.c
dma.c arm: convert sysdev_class to a regular subsystem 2011-12-21 16:01:38 -08:00
irq-pm.c ARM: S3C64XX: use static declaration when it is not used in other files 2012-01-21 12:02:31 +09:00
Kconfig ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
mach-anw6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-crag6410-module.c Merge branch 'samsung/board' into next/boards 2011-12-16 14:56:37 -08:00
mach-crag6410.c ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
mach-hmt.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-mini6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-ncp.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-real6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq.c ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
mach-smartq.h
mach-smartq5.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq7.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smdk6400.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smdk6410.c ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
Makefile ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pm.c ARM: S3C64XX: Remove unconditional power domain disables 2012-01-12 02:16:21 +09:00
s3c6400.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
s3c6410.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
setup-fb-24bpp.c ARM: S3C64XX: Remove extern from definition of framebuffer setup call 2011-12-02 14:17:36 +09:00
setup-i2c0.c
setup-i2c1.c
setup-ide.c
setup-keypad.c
setup-sdhci-gpio.c
setup-spi.c ARM: S3C64XX: Modified files for SPI consolidation work 2011-12-23 10:50:00 +09:00
setup-usb-phy.c ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
sleep.S