diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
| commit | 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (patch) | |
| tree | 5adc1ff2eaf64d450bf28bb6b2ce890db2567288 /Documentation/ABI/testing/sysfs-devices-memory | |
| parent | 5cf65713f87775c548e3eb48dbafa32e12f28000 (diff) | |
| parent | 0ea6e61122196509af82cc4f36cbdaacbefb8227 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
Documentation: update broken web addresses.
fix comment typo "choosed" -> "chosen"
hostap:hostap_hw.c Fix typo in comment
Fix spelling contorller -> controller in comments
Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
fs/Kconfig: Fix typo Userpace -> Userspace
Removing dead MACH_U300_BS26
drivers/infiniband: Remove unnecessary casts of private_data
fs/ocfs2: Remove unnecessary casts of private_data
libfc: use ARRAY_SIZE
scsi: bfa: use ARRAY_SIZE
drm: i915: use ARRAY_SIZE
drm: drm_edid: use ARRAY_SIZE
synclink: use ARRAY_SIZE
block: cciss: use ARRAY_SIZE
comment typo fixes: charater => character
fix comment typos concerning "challenge"
arm: plat-spear: fix typo in kerneldoc
reiserfs: typo comment fix
update email address
...
Diffstat (limited to 'Documentation/ABI/testing/sysfs-devices-memory')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-devices-memory | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/ABI/testing/sysfs-devices-memory b/Documentation/ABI/testing/sysfs-devices-memory index aba7d989208c..7405de26ee60 100644 --- a/Documentation/ABI/testing/sysfs-devices-memory +++ b/Documentation/ABI/testing/sysfs-devices-memory | |||
| @@ -7,7 +7,7 @@ Description: | |||
| 7 | added or removed dynamically to represent hot-add/remove | 7 | added or removed dynamically to represent hot-add/remove |
| 8 | operations. | 8 | operations. |
| 9 | Users: hotplug memory add/remove tools | 9 | Users: hotplug memory add/remove tools |
| 10 | https://w3.opensource.ibm.com/projects/powerpc-utils/ | 10 | http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils |
| 11 | 11 | ||
| 12 | What: /sys/devices/system/memory/memoryX/removable | 12 | What: /sys/devices/system/memory/memoryX/removable |
| 13 | Date: June 2008 | 13 | Date: June 2008 |
| @@ -19,7 +19,7 @@ Description: | |||
| 19 | identify removable sections of the memory before attempting | 19 | identify removable sections of the memory before attempting |
| 20 | potentially expensive hot-remove memory operation | 20 | potentially expensive hot-remove memory operation |
| 21 | Users: hotplug memory remove tools | 21 | Users: hotplug memory remove tools |
| 22 | https://w3.opensource.ibm.com/projects/powerpc-utils/ | 22 | http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils |
| 23 | 23 | ||
| 24 | What: /sys/devices/system/memory/memoryX/phys_device | 24 | What: /sys/devices/system/memory/memoryX/phys_device |
| 25 | Date: September 2008 | 25 | Date: September 2008 |
| @@ -58,7 +58,7 @@ Description: | |||
| 58 | by root to offline that section. | 58 | by root to offline that section. |
| 59 | # echo offline > /sys/devices/system/memory/memory22/state | 59 | # echo offline > /sys/devices/system/memory/memory22/state |
| 60 | Users: hotplug memory remove tools | 60 | Users: hotplug memory remove tools |
| 61 | https://w3.opensource.ibm.com/projects/powerpc-utils/ | 61 | http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils |
| 62 | 62 | ||
| 63 | 63 | ||
| 64 | What: /sys/devices/system/memoryX/nodeY | 64 | What: /sys/devices/system/memoryX/nodeY |