Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2009 14:33:49 +0000 (07:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2009 14:33:49 +0000 (07:33 -0700)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/maple: Add a quirk to disable MSI for IPR on Bimini


Trivial merge