tree 8a7c1b152a9103927962d6f398eff8bc76a6dab2
parent 0ee13079906f0e0b185b13a1fbdaf24d853baa8d
parent 5f92c329364c0bf2d3a356da5e8759fbe349f9d1
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1188546763 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1188546763 -0700

Merge branch 'master' of master.kernel.org:/pub/scm/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.