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
..
alpha	alpha: fix conversion from denormal float to double	2008-01-17 15:38:59 -08:00
arm	Merge branch 'pxa-plat' into devel	2008-01-28 13:21:38 +00:00
avr32	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6	2008-01-25 08:40:02 -08:00
blackfin	[Blackfin] arch: Add the semtimedop syscall. Upstream uClibc doesn't compile without it.	2008-01-27 19:56:43 +08:00
cris	Kobject: the cris iop_fw_load.c code is broken	2008-01-24 20:40:30 -08:00
frv	FRV: arrange things such that BRA can reach from the trap table	2007-11-29 09:24:54 -08:00
h8300	Kbuild/doc: fix links to Documentation files	2007-10-30 14:26:30 -07:00
ia64	sched: remove printk_clock references from ia64	2008-01-25 21:07:59 +01:00
m32r	m32r: Update sys_rt_sigsuspend	2007-11-28 01:24:04 +09:00
m68k	m68k: export atari_keyb_init	2007-11-26 19:15:31 -08:00
m68knommu	m68knommu: mark mem init functions as __init	2007-10-23 20:45:44 -07:00
mips	i2c-au1550: Convert to platform driver	2008-01-27 18:14:52 +01:00
parisc	[PARISC] print more than one character at a time for pdc console	2007-12-06 09:32:15 -08:00
powerpc	[I2C] i2c-mv64xxx: Don't set i2c_adapter.retries	2008-01-26 15:04:01 +00:00
ppc	Merge branch 'orion' into devel	2008-01-28 13:21:30 +00:00
s390	[S390] replace lock_cpu_hotplug with get_online_cpus	2008-01-26 14:11:33 +01:00
sh	Driver core: change sysdev classes to use dynamic kobject names	2008-01-24 20:40:40 -08:00
sh64	sh64: Kill off duplicate includes.	2007-11-05 12:18:17 +09:00
sparc	[SPARC]: Constify function pointer tables.	2008-01-22 18:29:20 -08:00
sparc64	[SPARC64]: Partially revert "Constify function pointer tables."	2008-01-23 21:32:04 -08:00
um	uml: user of helper_wait() got missed when it got extra arguments	2007-12-23 12:54:37 -08:00
v850	spelling fixes: arch/v850/	2007-10-20 01:24:05 +02:00
x86	sched: latencytop support	2008-01-25 21:08:34 +01:00
xtensa	[XTENSA]: Fix use of skb after netif_rx	2007-12-11 02:45:28 -08:00
.gitignore	arch: Ignore arch/i386 and arch/x86_64	2008-01-19 21:29:39 -08:00