From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 8 Mar 2006 02:02:16 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v3.12-rc1~38154
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d423421cb3e924cf68da231a732c3250c80afa4e;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] 3353/1: NAS100d: protect  nas100d_power_exit() with machine_is_nas100d()
  [ARM] 3352/1: DSB required for the completion of a TLB maintenance operation
---

d423421cb3e924cf68da231a732c3250c80afa4e