| commit | 3c29970c02829a91ab337abea2860973b291bd48 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 12 07:29:08 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 12 07:29:08 2008 -0700 |
| tree | 5dfc1606a26479250ab46f045a478e1a66a247cd | |
| parent | 59b1c82500bb5d658891bc8e8a2308b76d58a4de [diff] | |
| parent | 0d4b6b901c3d41beb0e1620316aee0aa234edf7f [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] ppc: More compile fixes [POWERPC] ppc: Don't run prom_init_check for arch/ppc builds [POWERPC] ppc: Include <asm/cacheflush.h> in kernel/ppc_ksyms.c [POWERPC] ppc: Use ebony_defconfig for defconfig [POWERPC] Fix default cputable entries for e200 and e500 families