From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 15 May 2010 04:28:42 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v3.12-rc1~10347
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bfcf1ae2b2b1c09ee2c420313afe47ac5cc32d3f;p=kernel%2Fkernel-generic.git

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6126/1: ARM mpcore_wdt: fix build failure and other fixes
  ARM: 6125/1: ARM TWD: move TWD registers to common header
  ARM: 6110/1: Fix Thumb-2 kernel builds when UACCESS_WITH_MEMCPY is enabled
  ARM: 6112/1: Use the Inner Shareable I-cache and BTB ops on ARMv7 SMP
  ARM: 6111/1: Implement read/write for ownership in the ARMv6 DMA cache ops
  ARM: 6106/1: Implement copy_to_user_page() for noMMU
  ARM: 6105/1: Fix the __arm_ioremap_caller() definition in nommu.c
---

bfcf1ae2b2b1c09ee2c420313afe47ac5cc32d3f