Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 31 Aug 2007 07:52:43 +0000 (00:52 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 31 Aug 2007 07:52:43 +0000 (00:52 -0700)
commitd66ac4752e891f319fa931ab72efb3352fafa50b
tree8a7c1b152a9103927962d6f398eff8bc76a6dab2
parent0ee13079906f0e0b185b13a1fbdaf24d853baa8d
parent5f92c329364c0bf2d3a356da5e8759fbe349f9d1
Merge branch 'master' of /linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix several bugs in MSI handling.
  [SPARC64]: Fix type and constant sizes wrt. sun4u IMAP/ICLR handling.