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] update pasemi_defconfig

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] update pasemi_defconfig
7529963c · Linus Torvalds · 3085354d · 5c29934d · 7529963c
Commit 7529963c authored Mar 27, 2008 by Linus Torvalds
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 88 additions and 54 deletions

arch/powerpc/configs/pasemi_defconfig arch/powerpc/configs/pasemi_defconfig +88 -54

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