diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 17:25:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 17:25:06 -0700 |
| commit | 2acb802b0c5485aedb46e23b2b45e49573454c09 (patch) | |
| tree | 82afbba3d073ce903cb737412b6eccdf8adab4b5 /mm | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes (diff) | |
| parent | powerpc: Remove use of CONFIG_PPC_MERGE (diff) | |
| download | linux-dev-2acb802b0c5485aedb46e23b2b45e49573454c09.tar.xz linux-dev-2acb802b0c5485aedb46e23b2b45e49573454c09.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: Remove use of CONFIG_PPC_MERGE
powerpc: Force printing of 'total_memory' to unsigned long long
powerpc: Fix compiler warning in arch/powerpc/mm/mem.c
powerpc: Move include files to arch/powerpc/include/asm
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions