From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 21 Feb 2006 02:27:58 +0000 (-0800)
Subject: [PATCH] cpu hotplug documentation fix
X-Git-Tag: v2.6.16-rc5~96
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6303dbf570e410067380daec670fdb4137ac0d1d;p=pandora-kernel.git

[PATCH] cpu hotplug documentation fix

Looks like there was a merge conflict when patches
8f8b1138fc9f65e3591aac83a4ee394fef34ac1d and
255acee706b333b79f593dd366f16e1f107cccc3 were applied which wasn't properly
resolved. Fix this and add some additional description.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

Reading git-diff-tree failed