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
..
board-2430sdp.c	[NET] smc91x: Make smc91x use IRQ resource trigger flags	2008-01-28 13:13:19 +00:00
board-apollon.c	Merge branch 'pxa-plat' into devel	2008-01-28 13:21:38 +00:00
board-generic.c
board-h4.c
clock.c	[ARM] Fix assignment instead of condition in arm/mach-omap2/clock.c	2007-10-31 15:21:43 +00:00
clock.h
devices.c
gpmc.c
id.c
io.c
irq.c
Kconfig
mailbox.c
Makefile
Makefile.boot
memory.c
memory.h
mux.c
pm-domain.c
pm.c	PM: Rework struct platform_suspend_ops	2007-10-18 14:37:18 -07:00
prcm-regs.h
prcm.c
serial.c
sleep.S
sram-fn.S
timer-gp.c	[ARM] Fix timer damage from d3d74453c3	2008-01-28 10:17:12 +00:00
usb-tusb6010.c