From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Jul 2010 00:28:13 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.35-rc6~40
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=2f7989efd4398d92b8adffce2e07dd043a0895fe;p=net-next-2.6.git

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6226/1: fix kprobe bug in ldr instruction emulation
  ARM: Update mach-types
  ARM: lockdep: fix unannotated irqs-on
  ARM: 6184/2: ux500: use neutral PRCMU base
  ARM: 6212/1: atomic ops: add memory constraints to inline asm
  ARM: 6211/1: atomic ops: fix register constraints for atomic64_add_unless
  ARM: 6210/1: Do not rely on reset defaults of L2X0_AUX_CTRL
---

2f7989efd4398d92b8adffce2e07dd043a0895fe