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, 3 insertions, 3 deletions

diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index 545f81b34ad7..d1521c3875b2 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -1698,13 +1698,13 @@ static int netdev_close(struct net_device *dev)
 
 #ifdef __i386__
         if (netif_msg_hw(np)) {
-                printk("\n"KERN_DEBUG"  Tx ring at %8.8x:\n",
+                printk(KERN_DEBUG "  Tx ring at %8.8x:\n",
                            (int)(np->tx_ring_dma));
                 for (i = 0; i < TX_RING_SIZE; i++)
-                        printk(" #%d desc. %4.4x %8.8x %8.8x.\n",
+                        printk(KERN_DEBUG " #%d desc. %4.4x %8.8x %8.8x.\n",
                                    i, np->tx_ring[i].status, np->tx_ring[i].frag[0].addr,
                                    np->tx_ring[i].frag[0].length);
-                printk("\n"KERN_DEBUG "  Rx ring %8.8x:\n",
+                printk(KERN_DEBUG "  Rx ring %8.8x:\n",
                            (int)(np->rx_ring_dma));
                 for (i = 0; i < /*RX_RING_SIZE*/4 ; i++) {
                         printk(KERN_DEBUG " #%d desc. %4.4x %4.4x %8.8x\n",