diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-27 17:34:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-27 17:34:16 +0200 |
| commit | 43a1141b9f4fd9453b43ba5e8f136e7d47220dde (patch) | |
| tree | 0833be3af2ccbed3562d8bff41a1392fcb63d19d /init | |
| parent | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | cpumask: cpulist_parse() comments correction (diff) | |
| download | linux-43a1141b9f4fd9453b43ba5e8f136e7d47220dde.tar.xz linux-43a1141b9f4fd9453b43ba5e8f136e7d47220dde.zip | |
Merge tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
Pull cpumask changes from Rusty Russell:
"Trivial comment changes to cpumask code. I guess it's getting boring."
Boring is good.
* tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
cpumask: cpulist_parse() comments correction
init: add comments to keep initcall-names in sync with initcall levels
cpumask: add a few comments of cpumask functions
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index eb72a5c4c844..95316a1b4a76 100644 --- a/init/main.c +++ b/init/main.c @@ -725,6 +725,7 @@ static initcall_t *initcall_levels[] __initdata = { __initcall_end, }; +/* Keep these in sync with initcalls in include/linux/init.h */ static char *initcall_level_names[] __initdata = { "early", "core", |