diff options
| author | Heiko Carstens | 2006-02-21 03:27:58 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-02-21 05:00:10 +0100 |
| commit | 6303dbf570e410067380daec670fdb4137ac0d1d (patch) | |
| tree | 19ae622f55fb1717a09617d1de8f0672e47ee6c1 /kernel/sysctl.c | |
| parent | [PATCH] x86_64: Don't set CONFIG_DEBUG_INFO in defconfig (diff) | |
| download | kernel-qcow2-linux-6303dbf570e410067380daec670fdb4137ac0d1d.tar.gz kernel-qcow2-linux-6303dbf570e410067380daec670fdb4137ac0d1d.tar.xz kernel-qcow2-linux-6303dbf570e410067380daec670fdb4137ac0d1d.zip | |
[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>
Diffstat (limited to 'kernel/sysctl.c')
0 files changed, 0 insertions, 0 deletions