Russell King ed40d0c472 Merge branch 'origin' into devel ...

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

2009-03-28 20:29:51 +00:00

..

include

Merge branch 'origin' into devel

2009-03-28 20:29:51 +00:00

adc.c

[ARM] S3C24XX: ADC driver core

2008-12-18 14:20:04 +00:00

clock-dclk.c

[ARM] Revert futher extraneous changes from the S3C header move

2009-03-11 18:28:24 +00:00

clock.c

[ARM] S3C: Move core clock support to plat-s3c

2008-12-15 21:46:18 +00:00

common-smdk.c

[ARM] S3C: Rename s3c2410_pm_init to s3c_pm_init.

2009-03-08 12:35:47 +00:00

cpu.c

[ARM] pass reboot command line to arch_reset()

2009-03-19 16:20:24 +00:00

devs.c

[ARM] S3C24XX: Add fourth UART definition for S3C2443

2008-12-18 16:26:16 +00:00

dma.c

[ARM] S3C: Remove unnecessary <linux/delay.h> includes

2008-12-18 16:36:02 +00:00

gpio.c

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

gpiolib.c

[ARM] S3C24XX: Add gpio_to_irq implementation

2009-01-08 16:24:08 +00:00

irq-pm.c

[ARM] S3C: Make IRQ_EINT sleep control common

2009-03-08 12:35:36 +00:00

irq.c

[ARM] S3C24XX: Remove changelog from arch/arm/plat-s3c24xx/irq.c

2009-03-08 12:35:30 +00:00

Kconfig

Merge branch 'next-s3c64xx' into next-merged

2008-12-18 14:52:04 +00:00

Makefile

[ARM] S3C24XX: Split PM code from arch/arm/plat-s3c24xx/irq.c

2009-03-08 12:35:25 +00:00

pm-simtec.c

[ARM] S3C: Rename s3c2410_pm_init to s3c_pm_init.

2009-03-08 12:35:47 +00:00

pm.c

[ARM] S3C: Move plat-s3c24xx pm.c support into plat-s3c

2009-03-08 12:33:51 +00:00

pwm.c

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

s3c244x-clock.c

[ARM] S3C24XX: Change clock locking to use spinlocks.

2008-12-15 21:46:07 +00:00

s3c244x-irq.c

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

s3c244x.c

[ARM] S3C: Move PM support functions to common location

2009-03-08 12:23:51 +00:00

s3c244x.h

[ARM] S3C24XX: Move initialisation code to arch/arm/plat-s3c

2008-12-15 21:45:57 +00:00

s3c2410-clock.c

[ARM] S3C: Update time initialisation to fix S3C64XX time problems

2008-12-16 10:13:02 +00:00

setup-i2c.c

[ARM] S3C: Make i2c device definition common to plat-s3c

2008-12-15 23:40:26 +00:00

sleep.S

[ARM] S3C: Tidy sleep code path to fix call flow

2009-03-10 11:48:07 +00:00

spi-bus0-gpe11_12_13.c

[ARM] S3C24XX: Default SPI pin configuration for SPI

2008-12-15 21:45:42 +00:00

spi-bus1-gpg5_6_7.c

[ARM] S3C24XX: Default SPI pin configuration for SPI

2008-12-15 21:45:42 +00:00