From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 26 Mar 2006 04:29:54 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: MMI-PSA29.97-13-9~51077
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a41622eaa97e40c811fb7756f403c0d4caa65654;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3030/2: fix permission check in the obscur cmpxchg syscall
  [ARM] nommu: rename compressed/head.S symbols to a new style
  [ARM] select TLS_REG_EMUL and NEEDS_SYSCALL_FOR_CMPXCHG
  [ARM] nommu: Move hardware page table definitions to pgtable-hwdef.h
  [ARM] Move read of processor ID out of lookup_processor_type()
  [ARM] Fix typo in tlbflush.h
  [ARM] noMMU: removes TLB codes in nommu mode
  [ARM] noMMU: block sys_fork in nommu mode
  [ARM] 3399/1: Fix link problem when CONFIG_PRINTK is disabled
  [ARM] 3398/1: Fix the VFP registers loading/storing base address
  [ARM] 3397/1: AT91RM9200 Header update
  [ARM] 3385/1: Battery support for sharp zaurus sl-5500 (collie)
  [ARM] SMP: don't set cpu_*_map in smp_prepare_boot_cpu
  include/linux/clk.h is betraying its ARM origins
  [ARM] Move enable_irq and disable_irq to assembler.h
  [ARM] 3391/1: use PLAT8250_DEV_PLATFORM{,1} for platform device id instead of 0/1
---

a41622eaa97e40c811fb7756f403c0d4caa65654