From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 31 Jul 2007 04:54:16 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
X-Git-Tag: v2.6.23-rc2~147
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8e268f333012c62fc6a5a10e1e2a19c1c389853e;p=linux.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
  sh64: Kill off virt_to_bus()/bus_to_virt().
  sh64: Fix irq_intc build failure.
  sh64: Fix fs.h removal from mm.h regressions.
---

8e268f333012c62fc6a5a10e1e2a19c1c389853e