projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2e2b426) | patch
[PATCH] cpu hotplug documentation fix
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Tue, 21 Feb 2006 02:27:58 +0000 (18:27 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 21 Feb 2006 04:00:10 +0000 (20:00 -0800)
commit6303dbf570e410067380daec670fdb4137ac0d1d
tree19ae622f55fb1717a09617d1de8f0672e47ee6c1tree | snapshot
parent2e2b42636614f3c152672b5da67947ccbcbe0d32commit | diff
[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>
Documentation/cpu-hotplug.txt diff | blob | history
John Crispins staging tree