Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/pmac: Update PowerMac 32-bit defconfig

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/pmac: Update PowerMac 32-bit defconfig
6823cfe5 · Linus Torvalds · 05ad709d · 60e59f68 · 6823cfe5
Commit 6823cfe5 authored Jun 02, 2009 by Linus Torvalds
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 195 additions and 83 deletions

arch/powerpc/configs/pmac32_defconfig arch/powerpc/configs/pmac32_defconfig +195 -83

No files found.
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig