From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 26 Oct 2006 14:44:41 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.19-rc4~75
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e80391500078b524083ba51c3df01bbaaecc94bb;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix memory corruption in pci_4u_free_consistent().
  [SPARC64]: Fix central/FHC bus handling on Ex000 systems.
---

e80391500078b524083ba51c3df01bbaaecc94bb