tree 20dc621d9f73ff0944b89b7891c0e4006efa46a6
parent 66a26a8fa7694cdfa418d1527416c4ea079309f4
parent 6eb0ac03899a1363ba176abe0830a9e6698c0503
author Linus Torvalds <torvalds@linux-foundation.org> 1243002829 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1243002829 -0700

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* '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