]> err.no Git - linux-2.6/commit
[PATCH] ppc32: Fix Kconfig mismerge
authorKumar Gala <galak@freescale.com>
Fri, 9 Sep 2005 20:01:26 +0000 (13:01 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 20:57:26 +0000 (13:57 -0700)
commit7f6fd5db2dbc28d475d67f9a6b041fefe1d6f7c8
treebfdafacff0e29677705ce226c626a09b9dd1f706
parentabda24528ac3045511fb59291a2d6ccbddf30eda
[PATCH] ppc32: Fix Kconfig mismerge

Looks like the help comment for MPC834x got merged incorrectly.

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/ppc/Kconfig