Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
commit3098a1801f8b92575a5cd69c77d9fa94ea504dde
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 5 Feb 2008 18:08:47 +0000 (5 10:08 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 5 Feb 2008 18:08:47 +0000 (5 10:08 -0800)
tree17fdccc7ab184c79a483f3210f02b613c1ba3c37
parent9914712e2e0f80ddcc00c928d3f7a5848d925e1e
parent4c6222587118f0776bdf40d498361d49572c58dd
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]  pci_sun4v.c: Section fixes.
arch/sparc64/kernel/pci_sun4v.c