From: Kumar Gala <galak@freescale.com>
Date: Fri, 9 Sep 2005 20:01:26 +0000 (-0700)
Subject: [PATCH] ppc32: Fix Kconfig mismerge
X-Git-Tag: v2.6.14-rc1~477
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f6fd5db2dbc28d475d67f9a6b041fefe1d6f7c8;p=pandora-kernel.git

[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>
---

Reading git-diff-tree failed