diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-30 14:45:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-30 14:45:51 +1000 |
| commit | d313adb8e4654b49451f4c48144a53b52928df88 (patch) | |
| tree | d294a9fc3683c801e40fea5b94f2dec94bc8ab1e /kernel | |
| parent | 79a52eec02612dbd4c623573c55e7a1e19ed201a (diff) | |
| parent | 7912a7d3f68eccecc7801f8994c540eb18808223 (diff) | |
Merge commit 'trivial/for-next'
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/panic.c | 2 | ||||
| -rw-r--r-- | kernel/tracepoint.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 984b3ecbd72c..b855012e1ee0 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -177,7 +177,7 @@ static const struct tnt tnts[] = { * 'W' - Taint on warning. * 'C' - modules from drivers/staging are loaded. * - * The string is overwritten by the next call to print_taint(). + * The string is overwritten by the next call to print_tainted(). */ const char *print_tainted(void) { diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c index 1ef5d3a601c7..b6bce8613a9c 100644 --- a/kernel/tracepoint.c +++ b/kernel/tracepoint.c @@ -47,7 +47,7 @@ static struct hlist_head tracepoint_table[TRACEPOINT_TABLE_SIZE]; /* * Note about RCU : - * It is used to to delay the free of multiple probes array until a quiescent + * It is used to delay the free of multiple probes array until a quiescent * state is reached. * Tracepoint entries modifications are protected by the tracepoints_mutex. */ |