From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 11 Apr 2007 22:44:45 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.21-rc7~21
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=80584ff3b99c36ead7e130e453b3a48b18072d18;p=karo-tx-linux.git

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

80584ff3b99c36ead7e130e453b3a48b18072d18