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)
commit1e787d139f89eb5f7080035625649ce4ce290037
tree20dc621d9f73ff0944b89b7891c0e4006efa46a6
parent66a26a8fa7694cdfa418d1527416c4ea079309f4
parent6eb0ac03899a1363ba176abe0830a9e6698c0503
Merge branch 'merge' of git://git./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