summaryrefslogtreecommitdiffstats
path: root/Documentation/aoe
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-08-15 07:06:31 +0200
committerLen Brown <len.brown@intel.com>2010-08-15 07:06:31 +0200
commit95ee46aa8698f2000647dfb362400fadbb5807cf (patch)
treee5a05c7297f997e191c73091934e42e3195c0e40 /Documentation/aoe
parentgcc-4.6: ACPI: fix unused but set variables in ACPI (diff)
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff)
downloadlinux-95ee46aa8698f2000647dfb362400fadbb5807cf.tar.xz
linux-95ee46aa8698f2000647dfb362400fadbb5807cf.zip
Merge branch 'linus' into release
Conflicts: drivers/acpi/debug.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'Documentation/aoe')
-rw-r--r--Documentation/aoe/aoe.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/aoe/aoe.txt b/Documentation/aoe/aoe.txt
index 3a4dbe4663c9..b5aada9f20cc 100644
--- a/Documentation/aoe/aoe.txt
+++ b/Documentation/aoe/aoe.txt
@@ -1,6 +1,6 @@
The EtherDrive (R) HOWTO for users of 2.6 kernels is found at ...
- http://www.coraid.com/support/linux/EtherDrive-2.6-HOWTO.html
+ http://www.coraid.com/SUPPORT/EtherDrive-HBA
It has many tips and hints!