diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-12 00:44:45 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-12 00:44:45 +0200 |
commit | 80584ff3b99c36ead7e130e453b3a48b18072d18 (patch) | |
tree | e6e16d05645bc4a69cddc8ca1097b8f2ec73a387 /arch/ppc | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
parent | [POWERPC] mpc52xx_pic: fix main interrupt masking (diff) | |
download | linux-80584ff3b99c36ead7e130e453b3a48b18072d18.tar.xz linux-80584ff3b99c36ead7e130e453b3a48b18072d18.zip |
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
Diffstat (limited to 'arch/ppc')
0 files changed, 0 insertions, 0 deletions