diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-04 00:16:33 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-04 00:16:33 +0200 |
| commit | 22da317629bad23816f3fa26d657fb46e7af21c7 (patch) | |
| tree | ea9e97afd3aca46c16b77468ef91e5e39d36ed7f /Makefile | |
| parent | fix s2io regression (diff) | |
| parent | [POWERPC] Fixes for the SLB shadow buffer code (diff) | |
| download | linux-22da317629bad23816f3fa26d657fb46e7af21c7.tar.xz linux-22da317629bad23816f3fa26d657fb46e7af21c7.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] Fixes for the SLB shadow buffer code
[POWERPC] Fix a compile warning in powermac/feature.c
[POWERPC] Fix a compile warning in pci_32.c
[POWERPC] Fix parse_drconf_memory() for 64-bit start addresses
[POWERPC] Fix num_cpus calculation in smp_call_function_map()
[POWERPC] ps3: Fix section mismatch in ps3/setup.c
[POWERPC] spufs: Fix affinity after introduction of node_allowed() calls
[POWERPC] Fix special PTE code for secondary hash bucket
[POWERPC] Expand RPN field to 34 bits when using 64k pages
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions