Russell King 988addf82e Merge branch 'origin' into devel-stable ... Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c		2010-03-08 20:21:04 +00:00
..
include/mach	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
cpu.c	ARM: S5PC1xx: add platform helpers for SDHCI host controllers	2009-12-01 01:33:17 +00:00
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
mach-smdkc100.c	SMDKC100: add SDHCI controllers 0, 1 and 2 support	2009-12-01 01:33:18 +00:00
Makefile	ARM: S5PC1xx: add platform helpers for SDHCI host controllers	2009-12-01 01:33:17 +00:00
Makefile.boot	ARM: S5PC100: Kconfigs and Makefiles	2009-08-16 23:35:19 +01:00
setup-sdhci.c	ARM: S5PC1xx: add platform helpers for SDHCI host controllers	2009-12-01 01:33:17 +00:00