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
..
clock.c	ARM: OMAP: add SoSSI clock (call propagate_rate for childrens)	2007-05-09 10:39:29 +01:00
common.c	ARM: OMAP: Fix 32k timer unsupported one-shot mode	2007-08-22 00:42:50 -07:00
cpu-omap.c	[CPUFREQ] move policy's governor initialisation out of low-level drivers into cpufreq core	2007-10-04 18:40:57 -04:00
debug-devices.c	[NET] smc91x: Make smc91x use IRQ resource trigger flags	2008-01-28 13:13:19 +00:00
debug-leds.c	ARM: OMAP: partial LED fixes	2007-05-09 10:39:42 +01:00
devices.c	ARM: OMAP: Mostly cosmetic to sync up with linux-omap tree	2007-05-09 10:38:46 +01:00
dma.c	Convert files to UTF-8 and some cleanups	2007-10-19 23:21:04 +02:00
dmtimer.c	ARM: OMAP: fix OMAP1 dmtimer build warning	2007-08-22 00:42:50 -07:00
fb.c	[ARM] 4633/1: omap build fix when FB enabled	2007-11-05 19:53:12 +00:00
gpio.c	Driver core: change sysdev classes to use dynamic kobject names	2008-01-24 20:40:40 -08:00
Kconfig	ARM: OMAP: abstract debug card setup (smc, leds)	2007-09-20 09:59:20 -07:00
mailbox.c	[ARM] Remove pointless casts from void pointers,	2008-01-26 14:50:00 +00:00
mailbox.h	ARM: OMAP: Add mailbox support for IVA	2007-05-09 10:37:10 +01:00
Makefile	ARM: OMAP: abstract debug card setup (smc, leds)	2007-09-20 09:59:20 -07:00
mcbsp.c	[ARM] Misc minor interrupt handler cleanups	2008-01-26 14:49:59 +00:00
mux.c	ARM: OMAP: 24xx pinmux updates	2007-05-10 15:51:09 -07:00
ocpi.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sram-fn.S	fix file specification in comments	2006-10-03 23:01:26 +02:00
sram.c	[ARM] spelling fixes	2007-05-20 20:10:32 +01:00
timer32k.c	ARM: OMAP: Fix 32k timer unsupported one-shot mode	2007-08-22 00:42:50 -07:00
usb.c	[ARM] spelling fixes	2007-05-20 20:10:32 +01:00