diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /kernel/trace/trace_entries.h | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.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 1516cb3ec549..e32744c84d94 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 |