Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / kernel / trace / trace_entries.h

diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
index 1516cb3ec549a1bd090df147cc156686df3fcd6a..e32744c84d9497bd041a2e612d82f1f859406af9 100644 (file)
--- a/kernel/trace/trace_entries.h
+++ b/kernel/trace/trace_entries.h
@@ -27,7 +27,7 @@
  *       in the structure.
  *
  *   * for structures within structures, the format of the internal
- *     structure is layed out. This allows the internal structure
+ *     structure is laid out. This allows the internal structure
  *     to be deciphered for the format file. Although these macros
  *     may become out of sync with the internal structure, they
  *     will create a compile error if it happens. Since the