Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 31 Jul 2007 04:54:16 +0000 (21:54 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 31 Jul 2007 04:54:16 +0000 (21:54 -0700)
commit8e268f333012c62fc6a5a10e1e2a19c1c389853e
treecaa132b137e1d65c7cf42a37ac23bfad41c3d6e1
parentcbdd3deb52ac9b013a63e4a60530717f75ce3177
parent75c46162be3d0025d448e0b738d6f8b51ff8a6e5
Merge /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.