Russell King 0ff66f0c7a Merge branch 'pxa-plat' into devel ... * pxa-plat: (53 commits) [ARM] 4762/1: Basic support for Toradex Colibri module [ARM] pxa: fix mci_init functions returning -1 [ARM] 4737/1: Refactor corgi_lcd to improve readability + bugfix [ARM] 4747/1: pcm027: support for pcm990 baseboard for phyCORE-PXA270 [ARM] 4746/1: pcm027: network support for phyCORE-PXA270 [ARM] 4745/1: pcm027: default configuration [ARM] 4744/1: pcm027: add support for phyCORE-PXA270 CPU module [NET] smc91x: Make smc91x use IRQ resource trigger flags [ARM] pxa: add default config for littleton [ARM] pxa: add basic support for Littleton (PXA3xx Form Factor Platform) [ARM] 4664/1: Add basic support for HTC Magician PDA phones [ARM] 4649/1: Base support for pxa-based Toshiba e-series PDAs. [ARM] pxa: skip registers saving/restoring if entering standby mode [ARM] pxa: fix PXA27x resume [ARM] pxa: Avoid fiddling with CKEN register on suspend [ARM] pxa: Add PXA3 standby code hooked into the IRQ wake scheme [ARM] pxa: Add zylonite MFP wakeup configurations [ARM] pxa: program MFPs for low power mode when suspending [ARM] pxa: make MFP configuration processor independent [ARM] pxa: remove un-used pxa3xx_mfp_set_xxx() functions ... Conflicts: arch/arm/mach-pxa/ssp.c Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>		2008-01-28 13:21:38 +00:00
..
at91_mci.c	[SG] Update drivers to use sg helpers	2007-10-22 21:19:53 +02:00
au1xmmc.c	scatterlist fallout: mmc	2007-10-27 22:18:12 -07:00
au1xmmc.h	mmc: Move host and card drivers to subdirs	2007-05-01 13:04:17 +02:00
imxmmc.c	Correction of "Update drivers to use sg helpers" patch for IMXMMC driver	2007-10-29 09:18:04 +01:00
imxmmc.h	mmc: Move host and card drivers to subdirs	2007-05-01 13:04:17 +02:00
Kconfig	mmc: Disabler for Ricoh MMC controller	2007-10-03 18:40:05 +02:00
Makefile	mmc: Disabler for Ricoh MMC controller	2007-10-03 18:40:05 +02:00
mmc_spi.c	spi: use simplified spi_sync() calling convention	2007-12-05 09:21:19 -08:00
mmci.c	mmc: sg fallout	2007-10-24 09:01:09 +02:00
mmci.h	mmc: fix sg->page fallout	2007-10-23 20:37:24 +02:00
omap.c	i2c/tps65010: move header to <linux/i2c/...>	2008-01-27 18:14:49 +01:00
pxamci.c	[ARM] 4711/1: pxa: mmc: move DMA specific code to platform layer	2008-01-26 15:07:52 +00:00
pxamci.h	[ARM] pxa: mmc: add 1st host controller support for pxa3xx	2008-01-26 15:07:53 +00:00
ricoh_mmc.c	mmc: Disabler for Ricoh MMC controller	2007-10-03 18:40:05 +02:00
sdhci.c	sdhci: support JMicron JMB38x chips	2007-12-12 20:01:00 +01:00
sdhci.h	sdhci: use PIO when DMA can't satisfy the request	2007-12-12 20:01:00 +01:00
tifm_sd.c	tifm_sd: handle non-power-of-2 block sizes	2007-11-21 18:42:45 +01:00
wbsd.c	mmc: sg fallout	2007-10-24 09:01:09 +02:00
wbsd.h	mmc: update header file paths	2007-07-26 01:53:31 +02:00