From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 12 Oct 2006 15:33:23 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
X-Git-Tag: v2.6.19-rc2~14
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9eb200748878751310cd9848c5dd4d467960beec;p=~emulex%2Finfiniband.git

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

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: SH-4A UBC support
  sh: interrupt exception handling rework
  sh: Default enable R7780RP IRQs.
  sh: Zero-out coherent buffer in consistent_alloc().
  sh: Convert IPR-IRQ to IRQ chip.
  sh: Convert INTC2 IRQ handler to irq_chip.
  sh: Fix pr_debug statements for sh4
  sh: Convert r7780rp IRQ handler to IRQ chip.
  sh: Updates for IRQ handler changes.
  sh: Kill off timer_ops get_frequency().
  sh: First step at generic timeofday support.
---

9eb200748878751310cd9848c5dd4d467960beec