Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 11 Apr 2007 22:44:45 +0000 (15:44 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 11 Apr 2007 22:44:45 +0000 (15:44 -0700)
commit80584ff3b99c36ead7e130e453b3a48b18072d18
treee6e16d05645bc4a69cddc8ca1097b8f2ec73a387
parent73aba63c5d62f4f504c6469c7c56311a0c818b20
parent22132178b26c907d19f661a4ae7fd265962d417e
Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] mpc52xx_pic: fix main interrupt masking