diff options
author | 2007-04-11 15:44:45 -0700 | |
---|---|---|
committer | 2007-04-11 15:44:45 -0700 | |
commit | 80584ff3b99c36ead7e130e453b3a48b18072d18 (patch) | |
tree | e6e16d05645bc4a69cddc8ca1097b8f2ec73a387 /drivers/acpi/processor_perflib.c | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (diff) | |
parent | [POWERPC] mpc52xx_pic: fix main interrupt masking (diff) | |
download | linux-dev-80584ff3b99c36ead7e130e453b3a48b18072d18.tar.xz linux-dev-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 'drivers/acpi/processor_perflib.c')
0 files changed, 0 insertions, 0 deletions