diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 10:34:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 10:34:24 -0700 |
commit | 6fbe85f914ad08cc43408a40ad18a561222e1b93 (patch) | |
tree | 320da01ba20dcbf6d31d80d35b1217193d663814 /init/Makefile | |
parent | a9a5cd5d2a57fb76dbae2115450f777b69beccf7 (diff) | |
parent | f39224a8c1828bdd327539da72a53d8a13595838 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge:
powerpc: Use correct sequence for putting CPU into nap mode
[PATCH] spufs: fix context-switch decrementer code
[PATCH] powerpc32: Set cpu explicitly in kernel compiles
[PATCH] powerpc/pseries: bugfix: balance calls to pci_device_put
[PATCH] powerpc: Fix machine detection in prom_init.c
[PATCH] ppc32: Fix string comparing in platform_notify_map
[PATCH] powerpc: Avoid __initcall warnings
[PATCH] powerpc: Ensure runlatch is off in the idle loop
powerpc: Fix CHRP booting - needs a define_machine call
powerpc: iSeries has only 256 IRQs
Diffstat (limited to 'init/Makefile')
0 files changed, 0 insertions, 0 deletions