Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 26 Oct 2006 14:44:41 +0000 (07:44 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 26 Oct 2006 14:44:41 +0000 (07:44 -0700)
commite80391500078b524083ba51c3df01bbaaecc94bb
treeba1ed8c744654ca91ee2b71b7cdee149c8edbef1
parent2a4f739dfc59edd52eaa37d63af1bd830ea42318
parent012d64ff68f304df1c35ce5902f5023dc14b643f
Merge /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.