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

2 files changed, 4 insertions, 4 deletions

diff --git a/Documentation/ABI/testing/sysfs-devices-memory b/Documentation/ABI/testing/sysfs-devices-memory
index aba7d989208..7405de26ee6 100644
--- a/Documentation/ABI/testing/sysfs-devices-memory
+++ b/Documentation/ABI/testing/sysfs-devices-memory
@@ -7,7 +7,7 @@ Description:
                 added or removed dynamically to represent hot-add/remove
                 operations.
 Users:          hotplug memory add/remove tools
-                https://w3.opensource.ibm.com/projects/powerpc-utils/
+                http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils
 
 What:           /sys/devices/system/memory/memoryX/removable
 Date:           June 2008
@@ -19,7 +19,7 @@ Description:
                 identify removable sections of the memory before attempting
                 potentially expensive hot-remove memory operation
 Users:          hotplug memory remove tools
-                https://w3.opensource.ibm.com/projects/powerpc-utils/
+                http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils    
 
 What:           /sys/devices/system/memory/memoryX/phys_device
 Date:           September 2008
@@ -58,7 +58,7 @@ Description:
                 by root to offline that section.
                 # echo offline > /sys/devices/system/memory/memory22/state
 Users:          hotplug memory remove tools
-                https://w3.opensource.ibm.com/projects/powerpc-utils/
+                http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils
 
 
 What:           /sys/devices/system/memoryX/nodeY
diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu
index 84a710f87c6..7564e88bfa4 100644
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
@@ -197,7 +197,7 @@ Description:	These files exist in every cpu's cache index directories.
                 Currently, only AMD Family 10h Processors support cache index
                 disable, and only for their L3 caches.  See the BIOS and
                 Kernel Developer's Guide at
-                http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/31116-Public-GH-BKDG_3.20_2-4-09.pdf
+                http://support.amd.com/us/Embedded_TechDocs/31116-Public-GH-BKDG_3-28_5-28-09.pdf       
                 for formatting information and other details on the
                 cache index disable.
 Users:    joachim.deguara@amd.com