diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-06-01 04:01:03 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-06-01 04:01:39 -0400 |
commit | 23db9f430be9325a861c7762c1ffadad9ca528a8 (patch) | |
tree | 1ebb681611c96f17aa4f96e28d6923824a8b210f /init | |
parent | 27b9613b7be39412775d0ab80f57229aa73bb07d (diff) | |
parent | 3218911f839b6c85acbf872ad264ea69aa4d89ad (diff) |
Merge branch 'linus' into perfcounters/core
Merge reason: merge almost-rc8 into perfcounters/core, which was -rc6
based - to pick up the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 3bbf93be744c..d721dad05dd7 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -566,8 +566,7 @@ asmlinkage void __init start_kernel(void) | |||
566 | tick_init(); | 566 | tick_init(); |
567 | boot_cpu_init(); | 567 | boot_cpu_init(); |
568 | page_address_init(); | 568 | page_address_init(); |
569 | printk(KERN_NOTICE); | 569 | printk(KERN_NOTICE "%s", linux_banner); |
570 | printk(linux_banner); | ||
571 | setup_arch(&command_line); | 570 | setup_arch(&command_line); |
572 | mm_init_owner(&init_mm, &init_task); | 571 | mm_init_owner(&init_mm, &init_task); |
573 | setup_command_line(command_line); | 572 | setup_command_line(command_line); |