ARM: Merge next-s3c64xx-updates

Merge branch 'next-s3c64xx-updates' into for-rmk

Conflicts:

	arch/arm/plat-s3c/dev-hsmmc2.c
	arch/arm/plat-s3c/include/plat/sdhci.h
This commit is contained in:
Ben Dooks 2009-12-03 21:53:10 +00:00
commit 009f742bde
11 changed files with 160 additions and 21 deletions