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
..
assabet_defconfig
at91cap9adk_defconfig	[ARM] 4765/1: [AT91] AT91CAP9A-DK board support	2008-01-26 15:01:14 +00:00
at91rm9200dk_defconfig
at91rm9200ek_defconfig
at91sam9rlek_defconfig
at91sam9260ek_defconfig
at91sam9261ek_defconfig
at91sam9263ek_defconfig
ateb9200_defconfig
badge4_defconfig	i2c: Delete the i2c-isa pseudo bus driver	2007-07-19 14:25:20 -04:00
carmeva_defconfig
cerfcube_defconfig
clps7500_defconfig	i2c: Delete the i2c-isa pseudo bus driver	2007-07-19 14:25:20 -04:00
cm_x270_defconfig	[ARM] 4576/1: CM-X270 machine support	2007-10-15 18:53:57 +01:00
colibri_defconfig	[ARM] 4762/1: Basic support for Toradex Colibri module	2008-01-28 13:13:27 +00:00
collie_defconfig	[ARM] remove reference to non-existent MTD_OBSOLETE_CHIPS	2008-01-26 14:50:02 +00:00
corgi_defconfig
csb337_defconfig
csb637_defconfig
ebsa110_defconfig
edb7211_defconfig
em_x270_defconfig	[ARM] 4475/2: EM-x270 board support	2007-07-20 17:45:15 +01:00
ep93xx_defconfig
eseries_pxa_defconfig	[ARM] 4649/1: Base support for pxa-based Toshiba e-series PDAs.	2008-01-28 13:13:13 +00:00
footbridge_defconfig	i2c: Delete the i2c-isa pseudo bus driver	2007-07-19 14:25:20 -04:00
fortunet_defconfig
h3600_defconfig
h7201_defconfig
h7202_defconfig
hackkit_defconfig
integrator_defconfig
iop13xx_defconfig	[ARM] 4708/1: iop: update defconfigs for 2.6.24	2008-01-26 14:37:57 +00:00
iop32x_defconfig	[ARM] 4708/1: iop: update defconfigs for 2.6.24	2008-01-26 14:37:57 +00:00
iop33x_defconfig	[ARM] 4708/1: iop: update defconfigs for 2.6.24	2008-01-26 14:37:57 +00:00
ixp4xx_defconfig
ixp23xx_defconfig
ixp2000_defconfig
jornada720_defconfig
kafa_defconfig
kb9202_defconfig
ks8695_defconfig	[ARM] 4333/2: KS8695: Micrel Development board	2007-05-11 22:02:55 +01:00
lart_defconfig
littleton_defconfig	[ARM] pxa: add default config for littleton	2008-01-28 13:13:18 +00:00
lpd7a400_defconfig
lpd7a404_defconfig
lpd270_defconfig
lubbock_defconfig
lusl7200_defconfig
mainstone_defconfig
msm_defconfig	[ARM] msm: board file for MACH_HALIBUT (QCT MSM7200A)	2008-01-26 14:39:14 +00:00
mx1ads_defconfig
neponset_defconfig	i2c: Delete the i2c-isa pseudo bus driver	2007-07-19 14:25:20 -04:00
netwinder_defconfig
netx_defconfig
ns9xxx_defconfig
omap_h2_1610_defconfig	ARM: OMAP: Update omap h2 defconfig	2007-09-20 18:34:50 -07:00
omap_osk_5912_defconfig	ARM: OMAP: Add omap osk defconfig	2007-09-20 18:34:51 -07:00
onearm_defconfig
orion_defconfig	[ARM] Orion: add support for QNAP TS-109/TS-209	2008-01-26 15:04:03 +00:00
pcm027_defconfig	[ARM] 4745/1: pcm027: default configuration	2008-01-28 13:13:22 +00:00
picotux200_defconfig	i2c: Delete the i2c-isa pseudo bus driver	2007-07-19 14:25:20 -04:00
pleb_defconfig
pnx4008_defconfig
pxa255-idp_defconfig
realview_defconfig
realview-smp_defconfig
rpc_defconfig	[ARM] rpc: update defconfig	2007-08-06 16:48:49 +01:00
s3c2410_defconfig	[ARM] 4518/1: S3C: Rename watchdog configuration options	2007-07-22 16:44:38 +01:00
shannon_defconfig
shark_defconfig
simpad_defconfig
spitz_defconfig
trizeps4_defconfig
versatile_defconfig
zylonite_defconfig	[ARM] 4636/1: pxa: add default configuration for zylonite	2007-10-31 15:21:48 +00:00