commit 6303dbf570e410067380daec670fdb4137ac0d1d
author Heiko Carstens <heiko.carstens@de.ibm.com> Mon Feb 20 18:27:58 2006 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> Mon Feb 20 20:00:10 2006 -0800
tree 19ae622f55fb1717a09617d1de8f0672e47ee6c1
parent 2e2b42636614f3c152672b5da67947ccbcbe0d32

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