Merge branch 'percpu-for-linus' into percpu-for-next

Conflicts:
	arch/sparc/kernel/smp_64.c
	arch/x86/kernel/cpu/perf_counter.c
	arch/x86/kernel/setup_percpu.c
	drivers/cpufreq/cpufreq_ondemand.c
	mm/percpu.c

Conflicts in core and arch percpu codes are mostly from commit
ed78e1e078dd44249f88b1dd8c76dafb39567161 which substituted many
num_possible_cpus() with nr_cpu_ids.  As for-next branch has moved all
the first chunk allocators into mm/percpu.c, the changes are moved
from arch code to mm/percpu.c.

Signed-off-by: Tejun Heo <tj@kernel.org>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 9578a3dfac01..206144f2470f 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -428,10 +428,11 @@ bmac_init_phy(struct net_device *dev)
         printk(KERN_DEBUG "phy registers:");
         for (addr = 0; addr < 32; ++addr) {
                 if ((addr & 7) == 0)
-                        printk("\n" KERN_DEBUG);
-                printk(" %.4x", bmac_mif_read(dev, addr));
+                        printk(KERN_DEBUG);
+                printk(KERN_CONT " %.4x", bmac_mif_read(dev, addr));
         }
-        printk("\n");
+        printk(KERN_CONT "\n");
+
         if (bp->is_bmac_plus) {
                 unsigned int capable, ctrl;