kernel-ark/include/asm-arm
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
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
arch-clps711x
arch-davinci
arch-ebsa110
arch-ebsa285
arch-ep93xx
arch-h720x
arch-imx
arch-integrator
arch-iop13xx
arch-iop32x
arch-iop33x
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
arch-ixp2000
arch-ks8695
arch-l7200
arch-lh7a40x
arch-msm
arch-mxc
arch-netx
arch-ns9xxx
arch-omap
arch-orion
arch-pnx4008
arch-pxa Merge branch 'pxa-plat' into devel 2008-01-28 13:21:38 +00:00
arch-realview
arch-rpc
arch-s3c2400
arch-s3c2410 [ARM] 4793/1: S3C24XX: Add IRQ->GPIO pin mapping function 2008-01-28 13:20:52 +00:00
arch-sa1100
arch-shark
arch-versatile
hardware
mach
plat-s3c
plat-s3c24xx [ARM] 4786/1: S3C2412: Add SPI FIFO controll constants 2008-01-28 13:20:51 +00:00
.gitignore
a.out.h
assembler.h
atomic.h
auxvec.h
bitops.h
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h
checksum.h
cnt32_to_63.h
cpu-multi32.h
cpu-single.h
cpu.h
cputime.h
current.h
delay.h
device.h
div64.h
dma-mapping.h
dma.h
domain.h
dyntick.h
ecard.h
elf.h
emergency-restart.h
errno.h
fb.h
fcntl.h
fiq.h
flat.h
floppy.h
fpstate.h
futex.h
glue.h
gpio.h
hardirq.h
hardware.h
hw_irq.h
hwcap.h
ide.h
io.h
ioctl.h
ioctls.h
ipcbuf.h
irq_regs.h
irq.h
irqflags.h
Kbuild
kdebug.h
kexec.h
kmap_types.h
kprobes.h
leds.h
limits.h
linkage.h
local.h
locks.h
mc146818rtc.h
memory.h
mman.h
mmu_context.h
mmu.h
mmzone.h
module.h
msgbuf.h
mtd-xip.h
mutex.h
namei.h
nwflash.h
page-nommu.h
page.h
param.h
parport.h
pci.h
percpu.h
pgalloc.h
pgtable-hwdef.h
pgtable-nommu.h
pgtable.h
poll.h
posix_types.h
proc-fns.h
processor.h
procinfo.h
ptrace.h
resource.h
rtc.h
scatterlist.h
sections.h
segment.h
semaphore-helper.h
semaphore.h
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
sizes.h
smp.h
socket.h
sockios.h
spinlock_types.h
spinlock.h
stat.h
statfs.h
string.h
suspend.h
system.h
termbits.h
termios.h
therm.h
thread_info.h
thread_notify.h
timex.h
tlb.h
tlbflush.h
topology.h
traps.h
types.h
uaccess.h
ucontext.h
unaligned.h
unistd.h
user.h
vfp.h
vfpmacros.h
vga.h
xor.h