Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 7 Jun 2007 16:36:55 +0000 (09:36 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 7 Jun 2007 16:36:55 +0000 (09:36 -0700)
commit8a2e21038df74c4401f422346b9371a959c21438
tree794986757facadd0b92c723c6dc561ca2e8d0dc5
parent7244d545c123ff33a3a5bff7fcb96a07778c32d1
parent9a412847fbe396563acf2a78d5830c9c6c5a5d43
Merge /pub/scm/linux/kernel/git/lethal/sh-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Fix se73180 platform device registration.
  sh: ioremap() through PMB needs asm/mmu.h.
  sh: voyagergx: Fix build warnings.
  sh: Fix SH4-202 clock fwk set_rate() mismatch.
  sh: microdev: Fix compile warnings.
  sh: Fix in_nmi symbol build error.