Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[~andy/linux] / Documentation / arm / Booting

diff --git a/Documentation/arm/Booting b/Documentation/arm/Booting
index fad566bb02fc8fdc509aa0b27c122fafe55d655e..76850295af8f93b0627f8a220f90ee8c6a677e92 100644 (file)
--- a/Documentation/arm/Booting
+++ b/Documentation/arm/Booting
@@ -118,7 +118,7 @@ to store page tables.  The recommended placement is 32KiB into RAM.
 
 In either case, the following conditions must be met:
 
 
 In either case, the following conditions must be met:
 

-- Quiesce all DMA capable devicess so that memory does not get
+- Quiesce all DMA capable devices so that memory does not get

   corrupted by bogus network packets or disk data. This will save
   you many hours of debug.
 
   corrupted by bogus network packets or disk data. This will save
   you many hours of debug.