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

..

acpi

kobject: convert /sys/firmware/acpi/ to use kobject_create

2008-01-24 20:40:23 -08:00

asm-alpha

alpha: build fixes

2007-12-17 19:28:16 -08:00

asm-arm

Merge branch 'pxa-plat' into devel

2008-01-28 13:21:38 +00:00

asm-avr32

[ARM] 4764/1: [AT91] AT91CAP9 core support

2008-01-26 15:01:13 +00:00

asm-blackfin

[Blackfin] arch: Add the semtimedop syscall. Upstream uClibc doesn't compile without it.

2008-01-27 19:56:43 +08:00

asm-cris

ide: remove stale ide.h "configuration options"

2008-01-25 22:17:08 +01:00

asm-frv

ide: remove stale ide.h "configuration options"

2008-01-25 22:17:08 +01:00

asm-generic

sched: SCHED_FIFO/SCHED_RR watchdog timer

2008-01-25 21:08:27 +01:00

asm-h8300

asm-h8300: parentheses around definition CLOCK_TICK_RATE

2007-12-10 19:43:54 -08:00

asm-ia64

[IA64] Update Altix BTE error return status patch

2008-01-03 13:18:58 -08:00

asm-m32r

m32r: Update sys_rt_sigsuspend

2007-11-28 01:24:04 +09:00

asm-m68k

Add CONFIG_DEBUG_SG sg validation

2007-10-22 21:20:03 +02:00

asm-m68knommu

m68knommu: fix pread/pwrite defines

2007-11-05 15:12:33 -08:00

asm-mips

[MIPS] SMTC: Fix build error.

2008-01-22 00:35:23 +00:00

asm-parisc

[PARISC] print more than one character at a time for pdc console

2007-12-06 09:32:15 -08:00

asm-powerpc

ide: remove stale ide.h "configuration options"

2008-01-25 22:17:08 +01:00

asm-ppc

ppc: fix AT_VECTOR_SIZE on arch/ppc

2007-10-22 19:18:54 -07:00

asm-s390

[S390] do local_irq_restore while spinning in spin_lock_irqsave.

2008-01-26 14:11:31 +01:00

asm-sh

sh: Force __access_ok() to obey address space limit.

2008-01-11 13:18:16 +09:00

asm-sh64

sh: remove PTRACE_O_TRACESYSGOOD from asm/ptrace.h

2007-11-07 11:13:54 +09:00

asm-sparc

[SPARC32]: Silence sparc32 warnings on missing syscalls.

2007-12-14 10:59:50 -08:00

asm-sparc64

[SPARC64]: Implement pci_resource_to_user()

2007-12-26 19:33:46 -08:00

asm-um

uml: update address space affected by pud_clear

2007-11-14 18:45:37 -08:00

asm-v850

Add CONFIG_DEBUG_SG sg validation

2007-10-22 21:20:03 +02:00

asm-x86

sched: high-res preemption tick

2008-01-25 21:08:29 +01:00

asm-xtensa

xtensa: dma-mapping.h is using linux/scatterlist.h functions, so include it

2007-10-24 13:28:40 +02:00

crypto

[CRYPTO] api: Include sched.h for cond_resched in scatterwalk.h

2008-01-11 08:16:59 +11:00

keys

…

linux

Merge branch 'orion' into devel

2008-01-28 13:21:30 +00:00

math-emu

…

media

i2c: Constify client address data

2008-01-27 18:14:46 +01:00

mtd

…

net

IPoIB: improve IPv4/IPv6 to IB mcast mapping functions

2008-01-25 14:15:37 -08:00

pcmcia

[AVR32] pcmcia ioaddr_t should be 32 bits on AVR32

2007-11-15 13:47:19 +01:00

rdma

RDMA/cma: add support for rdma_migrate_id()

2008-01-25 14:15:32 -08:00

rxrpc

…

scsi

[SCSI] libsas: abstract STP task status into a function

2008-01-25 11:47:23 -06:00

sound

[ALSA] version 1.0.15

2007-11-20 20:16:43 +01:00

video

Make asm-x86/bootparam.h includable from userspace.

2007-10-23 15:49:47 +10:00

xen

…

Kbuild

…