| commit | 2acb802b0c5485aedb46e23b2b45e49573454c09 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 04 17:25:06 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 04 17:25:06 2008 -0700 |
| tree | 82afbba3d073ce903cb737412b6eccdf8adab4b5 | |
| parent | d8f4b819c3a5b54a978c6fe5249a17cff490c4a1 [diff] | |
| parent | 9c4cb82515130c62224e23fdf7c13c8f6c59c614 [diff] |
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