Merge branch 'master'

[linux-2.6] / include / linux / elevator.h

diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 4a6f50e31c73191016c1813ef3e3124156d9dbcb..23fe746a1d514b8f912c7c6cfab8e53d5ba8e92d 100644 (file)
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -66,7 +66,7 @@ struct elevator_type
 };
 
 /*
- * each queue has an elevator_queue assoicated with it
+ * each queue has an elevator_queue associated with it
  */
 struct elevator_queue
 {