From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 29 Feb 2008 16:32:15 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
X-Git-Tag: v2.6.25-rc4~147
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83afdf2464ac17ad6321a68b2fe7528c9aa88016;p=linux-2.6

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

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  arch/sh/drivers/dma/dma-sh.c: Correct use of ! and &
  serial: Move asm-sh/sci.h to linux/serial_sci.h.
  sh: Fix up HAS_SR_RB typo in entry-macros.

  maple: fix device detection
  sh: fix rtc_resources setup for sh770x
  sh: heartbeat: ioremap is expected to succeed
  sh: Storage class should be before const qualifier
  maple: remove unused variable
  sh: SH5-103 needs to select CPU_SH5.
  sh: Rename SH-3 CCR3 reg to avoid synclink_cs clash.
---

83afdf2464ac17ad6321a68b2fe7528c9aa88016