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-ams-delta.c	ARM: OMAP: Sync board specific files with linux-omap	2007-09-20 18:34:50 -07:00
board-fsample.c	[NET] smc91x: Make smc91x use IRQ resource trigger flags	2008-01-28 13:13:19 +00:00
board-generic.c	[ARM] 3433/1: ARM: OMAP: 8/8 Update board files	2006-04-02 17:46:30 +01:00
board-h2.c	Merge branch 'pxa-plat' into devel	2008-01-28 13:21:38 +00:00
board-h3.c	Merge branch 'pxa-plat' into devel	2008-01-28 13:21:38 +00:00
board-innovator.c	[NET] smc91x: Make smc91x use IRQ resource trigger flags	2008-01-28 13:13:19 +00:00
board-nokia770.c	[ARM] remove duplicate includes	2008-01-26 14:50:07 +00:00
board-osk.c	Merge branch 'pxa-plat' into devel	2008-01-28 13:21:38 +00:00
board-palmte.c	ARM: OMAP: Sync board specific files with linux-omap	2007-09-20 18:34:50 -07:00
board-palmtt.c	[ARM] remove duplicate includes	2008-01-26 14:50:07 +00:00
board-palmz71.c	[ARM] remove duplicate includes	2008-01-26 14:50:07 +00:00
board-perseus2.c	[NET] smc91x: Make smc91x use IRQ resource trigger flags	2008-01-28 13:13:19 +00:00
board-sx1.c	ARM: OMAP: Basic support for siemens sx1	2007-09-20 18:34:50 -07:00
board-voiceblue.c	[NET] smc91x: Make smc91x use IRQ resource trigger flags	2008-01-28 13:13:19 +00:00
clock.c	ARM: OMAP: add SoSSI clock	2007-09-20 18:34:49 -07:00
clock.h	ARM: OMAP: add SoSSI clock	2007-09-20 18:34:49 -07:00
devices.c	ARM: OMAP: Sync core code with linux-omap	2007-05-08 20:36:31 +01:00
fpga.c	[ARM] Remove compatibility layer for ARM irqs	2006-11-30 12:24:47 +00:00
id.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
io.c	ARM: OMAP: FB sync with N800 tree (support for dynamic SRAM allocations)	2007-05-09 10:39:14 +01:00
irq.c	Convert files to UTF-8 and some cleanups	2007-10-19 23:21:04 +02:00
Kconfig	ARM: OMAP: Basic support for siemens sx1	2007-09-20 18:34:50 -07:00
leds-h2p2-debug.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
leds-innovator.c	[ARM] omap1/leds-innovator.c: remove dead code	2007-10-12 23:43:20 +01:00
leds-osk.c	i2c/tps65010: move header to <linux/i2c/...>	2008-01-27 18:14:49 +01:00
leds.c	[ARM] 3141/1: OMAP 1/5: Update omap1 specific files	2005-11-10 14:26:48 +00:00
leds.h	[PATCH] ARM: 2799/1: OMAP update 4/11: Move OMAP1 LED code into mach-omap1 directory	2005-07-10 19:58:10 +01:00
mailbox.c	ARM: OMAP: Add mailbox support for IVA	2007-05-09 10:37:10 +01:00
Makefile	ARM: OMAP: Basic support for siemens sx1	2007-09-20 18:34:50 -07:00
Makefile.boot	[PATCH] ARM: 2798/1: OMAP update 2/11: Change ARM Kconfig to support omap1 and omap2	2005-07-10 19:58:08 +01:00
mux.c	ARM: OMAP: omap camera builds again; Mistral init and mux	2007-09-20 18:34:49 -07:00
pm.c	[ARM] Misc minor interrupt handler cleanups	2008-01-26 14:49:59 +00:00
serial.c	ARM: OMAP: OMAP310 Serial	2007-03-02 01:47:09 -08:00
sleep.S	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
time.c	clockevents: fix resume logic	2007-07-21 17:49:15 -07:00