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

clock.c

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

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

dev-fb.c

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

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

dev-hsmmc1.c

[ARM] S3C: Add SDHCI (HSMMC) channel 1 device definition

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

dev-hsmmc.c

[ARM] S3C6410: Add helper for setting SDHCI device information

2008-12-15 23:39:34 +00:00

dev-i2c0.c

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

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

dev-i2c1.c

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

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

gpio-config.c

[ARM] S3C: Add new GPIO configuration calls

2008-12-15 23:34:15 +00:00

gpio.c

[ARM] S3C: Add GPIO chip tracking

2008-12-15 23:33:42 +00:00

init.c

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

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

Kconfig

[ARM] s3c: S3C options should depend on PLAT_S3C

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

Makefile

[ARM] S3C: Split the resume memory check code from pm.c

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

pm-check.c

[ARM] S3C: Do not kmalloc/kfree during inner suspend code.

2009-03-08 13:19:54 +00:00

pm.c

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

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

pwm-clock.c

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

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

time.c

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

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