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

..

arch-aaec2000

Convert files to UTF-8 and some cleanups

2007-10-19 23:21:04 +02:00

arch-at91

Merge branches 'at91', 'ep93xx', 'iop', 'kprobes', 'ks8695', 'misc', 'msm', 's3c2410', 'sa1100' and 'vfp' into devel

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

arch-cl7500

[ARM] Use new get_irqnr_preamble

2007-05-12 15:25:50 +01:00

arch-clps711x

[ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user

2007-02-17 15:04:29 +00:00

arch-davinci

[ARM] 4634/1: DaVinci GPIO header build fix

2007-10-31 15:21:52 +00:00

arch-ebsa110

[ARM] Use new get_irqnr_preamble

2007-05-12 15:25:50 +01:00

arch-ebsa285

[ARM] Use new get_irqnr_preamble

2007-05-12 15:25:50 +01:00

arch-ep93xx

[ARM] 4671/1: ep93xx: remove obsolete gpio_line_* operations

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

arch-h720x

[ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user

2007-02-17 15:04:29 +00:00

arch-imx

imxfb: fast read flag and nonstandard field configurable

2007-10-16 09:43:21 -07:00

arch-integrator

[ARM] Remove Integrator/CP SMP platform support

2007-05-16 15:35:26 +01:00

arch-iop13xx

[ARM] 4495/1: iop: combined watchdog timer driver for iop3xx and iop13xx

2007-07-20 09:35:42 +01:00

arch-iop32x

[ARM] 4476/1: EM7210/SS4000E support

2007-07-20 09:35:35 +01:00

arch-iop33x

iop3xx: surface the iop3xx DMA and AAU units to the iop-adma driver

2007-07-13 08:06:19 -07:00

arch-ixp4xx

Merge branches 'at91', 'ep93xx', 'iop', 'kprobes', 'ks8695', 'misc', 'msm', 's3c2410', 'sa1100' and 'vfp' into devel

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

arch-ixp23xx

[ARM] 4680/1: parentheses around NR_IRQS definition

2007-11-29 20:56:57 +00:00

arch-ixp2000

[ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user

2007-02-17 15:04:29 +00:00

arch-ks8695

[ARM] 4603/1: KS8695: debugfs interface to view pin state

2008-01-26 14:38:48 +00:00

arch-l7200

[ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user

2007-02-17 15:04:29 +00:00

arch-lh7a40x

[ARM] 4248/1: lh7a40x: fix missing definitions for get_irqnr_preamble

2007-03-08 13:33:57 +00:00

arch-msm

[ARM] msm: dma support for MSM7X00A

2008-01-26 14:39:14 +00:00

arch-mxc

[ARM] 4530/1: MXC: fix elf_hwcap compile breakage as in iop13xx

2007-07-28 20:52:55 +01:00

arch-netx

[ARM] 4329/1: fix position of NETX_SYSTEM_REG

2007-05-03 20:22:49 +01:00

arch-ns9xxx

[ARM] 4595/1: ns9xxx: define registers as void __iomem * instead of volatile u32

2007-10-12 23:43:41 +01:00

arch-omap

i2c/tps65010: move header to <linux/i2c/...>

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

arch-orion

[ARM] Orion: MV88F5181 support bits

2008-01-26 15:03:55 +00:00

arch-pnx4008

[ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user

2007-02-17 15:04:29 +00:00

arch-pxa

Merge branch 'pxa-plat' into devel

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

arch-realview

[ARM] Use new get_irqnr_preamble

2007-05-12 15:25:50 +01:00

arch-rpc

[ARM] 4564/1: Add tagged list support for Acorn RiscPC's uncompress code

2007-10-12 23:43:11 +01:00

arch-s3c2400

[ARM] 4522/1: S3C: split include/asm-arm/arch/memory.h

2007-07-22 17:06:04 +01:00

arch-s3c2410

[ARM] 4793/1: S3C24XX: Add IRQ->GPIO pin mapping function

2008-01-28 13:20:52 +00:00

arch-sa1100

[ARM] unbalanced parenthesis fix

2007-10-12 23:43:21 +01:00

arch-shark

[ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user

2007-02-17 15:04:29 +00:00

arch-versatile

[ARM] Use new get_irqnr_preamble

2007-05-12 15:25:50 +01:00

hardware

[ARM] Fix iop3xx macro

2007-11-05 09:40:27 +00:00

mach

[ARM] use __used attribute

2007-05-30 13:15:06 +01:00

plat-s3c

[ARM] 4632/1: Fix a typo in include/asm-arm/plat-s3c/regs-nand.h

2007-10-31 15:21:33 +00:00

plat-s3c24xx

[ARM] 4786/1: S3C2412: Add SPI FIFO controll constants

2008-01-28 13:20:51 +00:00

.gitignore

[ARM] 4216/1: add .gitignore entries for ARM specific files

2007-02-17 11:26:41 +00:00

a.out.h

arch: personality independent stack top

2007-07-19 10:04:45 -07:00

assembler.h

[ARM] Remove MODE_(SVC|IRQ|FIQ|USR) and DEFAULT_FIQ

2006-06-25 12:01:48 +01:00

atomic.h

atomic.h: atomic_add_unless as inline. Remove system.h atomic.h circular dependency

2007-05-08 11:15:20 -07:00

auxvec.h

[PATCH] auxiliary vector cleanups

2005-09-07 16:57:21 -07:00

bitops.h

forbid asm/bitops.h direct inclusion

2007-10-19 11:53:41 -07:00

bug.h

[ARM] 3983/2: remove unused argument to __bug()

2006-12-07 22:38:09 +00:00

bugs.h

[ARM] nommu: adjust headers for !MMU ARM systems

2006-06-28 17:59:45 +01:00

byteorder.h

[ARM] Fix byte order macros for Thumb

2006-06-19 15:35:36 +01:00

cache.h

[PATCH] Kill L1_CACHE_SHIFT_MAX

2006-01-08 20:13:39 -08:00

cacheflush.h

[ARM] Marvell Feroceon CPU core support

2008-01-26 15:03:38 +00:00

checksum.h

[ARM] Improve csum_fold, cleanup csum_tcpudp_magic()

2007-02-06 16:46:46 +00:00

cnt32_to_63.h

[ARM] 3978/1: macro to provide a 63-bit value from a 32-bit hardware counter

2006-12-07 16:06:45 +00:00

cpu-multi32.h

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

cpu-single.h

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

cpu.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

cputime.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

current.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

delay.h

[ARM] 3346/1: Fix udelay() for HZ values different from 100

2006-03-21 22:06:07 +00:00

device.h

[ARM] Add a reference from struct device to the dma bounce info

2007-02-12 10:28:24 +00:00

div64.h

[NET]: div64_64 consolidate (rev3)

2007-04-25 22:23:33 -07:00

dma-mapping.h

arm: sg fallout

2007-10-23 12:37:59 +02:00

dma.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

domain.h

[ARM] 4127/1: Flush the prefetch buffer after changing the DACR

2007-02-08 14:49:18 +00:00

dyntick.h

[ARM] 3692/1: ARM: coswitch irq handling to the generic implementation

2006-07-01 22:30:09 +01:00

ecard.h

[ARM] ecard: add ecardm_iomap() / ecardm_iounmap()

2007-05-11 17:19:02 +01:00

elf.h

[ARM] 4496/1: elf_hwcap: fix up #include misplacement

2007-07-20 21:29:18 +01:00

emergency-restart.h

[PATCH] Add emergency_restart()

2005-07-26 14:35:41 -07:00

errno.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

fb.h

fbdev: detect primary display device

2007-07-17 10:23:11 -07:00

fcntl.h

[PATCH] Clean up struct flock64 definitions

2005-09-07 16:57:38 -07:00

fiq.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

flat.h

[ARM] nommu: fix breakage caused by f9720205d1f847cb59e197e851b5276425363f6b

2007-10-31 15:21:42 +00:00

floppy.h

cleanup floppy.h

2007-10-17 08:42:55 -07:00

fpstate.h

[ARM] 4583/1: ARMv7: Add VFPv3 support

2008-01-26 14:41:28 +00:00

futex.h

[PATCH] consolidate asm/futex.h

2006-01-08 20:13:39 -08:00

glue.h

[ARM] armv7: add support for ARMv7 cores.

2007-05-08 22:55:53 +01:00

gpio.h

[PATCH] GPIO core

2007-02-12 09:48:34 -08:00

hardirq.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

hardware.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

hw_irq.h

[PATCH] misc arm pt_regs fixes

2006-10-08 12:32:36 -07:00

hwcap.h

[ARM] 4473/2: Take the HWCAP definitions out of the elf.h file

2007-07-12 16:20:15 +01:00

ide.h

ide: add CONFIG_IDE_ARCH_OBSOLETE_INIT

2007-10-20 00:32:32 +02:00

io.h

endianness annotations in arm io.h

2007-10-14 12:41:52 -07:00

ioctl.h

[PATCH] Generic ioctl.h

2006-01-10 08:01:34 -08:00

ioctls.h

[ARM] enable arbitary speed tty ioctls and split input/output speed

2007-05-28 23:07:34 +01:00

ipcbuf.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

irq_regs.h

Initial blind fixup for arm for irq changes

2006-10-06 10:59:54 -07:00

irq.h

[ARM] 4073/1: Prevent s3c24xx drivers from including asm/arch/hardware.h and asm/arch/irqs.h

2006-12-30 17:05:07 +00:00

irqflags.h

[ARM] Add ARM irqtrace support

2006-09-20 14:58:35 +01:00

Kbuild

[ARM] 4473/2: Take the HWCAP definitions out of the elf.h file

2007-07-12 16:20:15 +01:00

kdebug.h

move die notifier handling to common code

2007-05-08 11:15:04 -07:00

kexec.h

[ARM] 4599/1: Preserve ATAG list for use with kexec (2.6.23)

2007-10-12 23:43:48 +01:00

kmap_types.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

kprobes.h

ARM kprobes: special hook for the kprobes breakpoint handler

2008-01-26 15:25:17 +00:00

leds.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

limits.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

linkage.h

[ARM] VFP: fix section mismatch error

2007-06-10 12:22:20 +01:00

local.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

locks.h

[ARM] 3019/1: fix wrong comments

2005-10-18 07:51:34 +01:00

mc146818rtc.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

memory.h

[ARM] Clean up discontigmem support

2006-11-30 22:52:28 +00:00

mman.h

[PATCH] add asm-generic/mman.h

2006-02-15 15:32:22 -08:00

mmu_context.h

[ARM] ARMv6: add CPU_HAS_ASID configuration

2007-05-17 10:19:23 +01:00

mmu.h

[ARM] ARMv6: add CPU_HAS_ASID configuration

2007-05-17 10:19:23 +01:00

mmzone.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

module.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

msgbuf.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

mtd-xip.h

[MTD] XIP cleanup

2005-07-07 16:50:16 +02:00

mutex.h

[ARM] 3311/1: clean up include/asm-arm/mutex.h

2006-02-08 21:19:38 +00:00

namei.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

nwflash.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

page-nommu.h

[ARM] nommu: adjust headers for !MMU ARM systems

2006-06-28 17:59:45 +01:00

page.h

Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel

2006-09-27 19:57:54 +01:00

param.h

[ARM] Move HZ definition into Kconfig

2006-03-21 22:05:45 +00:00

parport.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

pci.h

[ARM] 4577/1: ITE 8152 PCI bridge support

2007-10-15 18:53:59 +01:00

percpu.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

pgalloc.h

[ARM] nommu: adjust headers for !MMU ARM systems

2006-06-28 17:59:45 +01:00

pgtable-hwdef.h

[ARM] Set bit 4 on section mappings correctly depending on CPU

2006-06-29 18:24:21 +01:00

pgtable-nommu.h

[ARM] 4531/1: remove is_in_rom() protptype

2007-08-04 22:13:43 +01:00

pgtable.h

[ARM] 4644/2: fix flush_kern_tlb_range() in module space

2007-11-08 10:07:14 +00:00

poll.h

Consolidate asm/poll.h

2007-05-11 08:29:34 -07:00

posix_types.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

proc-fns.h

[ARM] Marvell Feroceon CPU core support

2008-01-26 15:03:38 +00:00

processor.h

[ARM] 4016/1: prefetch macro is wrong wrt gcc's "delete-null-pointer-checks"

2006-12-13 18:30:20 +00:00

procinfo.h

[ARM] Move HWCAP_* definitions to asm/elf.h

2006-11-30 12:24:46 +00:00

ptrace.h

[ARM] 4474/1: Do not check the PSR_F_BIT in valid_user_regs

2007-07-12 16:20:52 +01:00

resource.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

rtc.h

[PATCH] RTC subsystem: ARM cleanup

2006-03-27 08:44:50 -08:00

scatterlist.h

Add CONFIG_DEBUG_SG sg validation

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

sections.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

segment.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

semaphore-helper.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

semaphore.h

kill DECLARE_MUTEX_LOCKED

2007-10-17 08:42:47 -07:00

sembuf.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

serial.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

setup.h

[ARM] use __used attribute

2007-05-30 13:15:06 +01:00

shmbuf.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

shmparam.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sigcontext.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

siginfo.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

signal.h

[PATCH] ARM: fixup irqflags breakage after ARM genirq merge

2006-07-02 17:29:22 -07:00

sizes.h

[ARM] 4372/1: Define byte sizes in asm-arm/sizes.h

2007-05-11 21:07:58 +01:00

smp.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

socket.h

[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support

2007-04-25 22:24:21 -07:00

sockios.h

[NET]: Introduce SIOCGSTAMPNS ioctl to get timestamps with nanosec resolution

2007-04-25 22:24:04 -07:00

spinlock_types.h

[PATCH] spinlock consolidation

2005-09-10 10:06:21 -07:00

spinlock.h

[PATCH] Remove the last reference to rwlock_is_locked() macro.

2007-02-11 10:51:34 -08:00

stat.h

[ARM] 3106/2: ARM EABI: some syscall adjustments

2006-01-14 16:32:12 +00:00

statfs.h

[ARM] 3108/2: old ABI compat: statfs64 and fstatfs64

2006-01-14 16:35:03 +00:00

string.h

[PATCH] ARM: 2653/1: Fix memset and memzero macro double-reference of parameters

2005-04-25 23:40:05 +01:00

suspend.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

system.h

[ARM] pxa: silence warnings from cpu_is_xxx() macros

2008-01-10 12:33:54 +00:00

termbits.h

[ARM] enable arbitary speed tty ioctls and split input/output speed

2007-05-28 23:07:34 +01:00

termios.h

[ARM] enable arbitary speed tty ioctls and split input/output speed

2007-05-28 23:07:34 +01:00

therm.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

thread_info.h

remove unused TIF_NOTIFY_RESUME flag

2007-07-31 15:39:38 -07:00

thread_notify.h

[ARM] Add thread_notify infrastructure

2006-06-22 10:24:18 +01:00

timex.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

tlb.h

[ARM] noMMU: removes TLB codes in nommu mode

2006-03-21 22:03:20 +00:00

tlbflush.h

remove unused flush_tlb_pgtables

2007-10-19 11:53:34 -07:00

topology.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

traps.h

ARM kprobes: prevent some functions involved with kprobes from being probed

2008-01-26 15:25:17 +00:00

types.h

remove strict ansi check from __u64 in asm/types.h

2007-10-17 08:42:53 -07:00

uaccess.h

Storage class should be before const qualifier

2007-02-17 20:11:19 +01:00

ucontext.h

[ARM] 3664/1: crunch: add signal frame save/restore

2006-06-28 17:54:59 +01:00

unaligned.h

arm unaligned.h annotations

2007-07-26 11:11:57 -07:00

unistd.h

[ARM] Add fallocate syscall entry

2007-10-12 23:43:31 +01:00

user.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

vfp.h

[ARM] 4583/1: ARMv7: Add VFPv3 support

2008-01-26 14:41:28 +00:00

vfpmacros.h

[ARM] 4583/1: ARMv7: Add VFPv3 support

2008-01-26 14:41:28 +00:00

vga.h

[PATCH] vgacon: make VGA_MAP_MEM take size, remove extra use

2006-06-22 15:05:58 -07:00

xor.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00