diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /kernel/trace/trace_entries.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'kernel/trace/trace_entries.h')
| -rw-r--r-- | kernel/trace/trace_entries.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h index 1516cb3ec54..e32744c84d9 100644 --- a/kernel/trace/trace_entries.h +++ b/kernel/trace/trace_entries.h | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | * in the structure. | 27 | * in the structure. |
| 28 | * | 28 | * |
| 29 | * * for structures within structures, the format of the internal | 29 | * * for structures within structures, the format of the internal |
| 30 | * structure is layed out. This allows the internal structure | 30 | * structure is laid out. This allows the internal structure |
| 31 | * to be deciphered for the format file. Although these macros | 31 | * to be deciphered for the format file. Although these macros |
| 32 | * may become out of sync with the internal structure, they | 32 | * may become out of sync with the internal structure, they |
| 33 | * will create a compile error if it happens. Since the | 33 | * will create a compile error if it happens. Since the |