tree e6e16d05645bc4a69cddc8ca1097b8f2ec73a387
parent 73aba63c5d62f4f504c6469c7c56311a0c818b20
parent 22132178b26c907d19f661a4ae7fd265962d417e
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1176331485 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1176331485 -0700

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