Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	arch/microblaze/include/asm/socket.h

3 files changed, 7 insertions, 7 deletions

diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index 223238de475c..1ea1ef6c3b96 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -584,8 +584,9 @@ static void sca_dump_rings(struct net_device *dev)
                sca_in(DSR_RX(phy_node(port)), card) & DSR_DE ? "" : "in");
         for (cnt = 0; cnt < port_to_card(port)->rx_ring_buffers; cnt++)
                 printk(" %02X", readb(&(desc_address(port, cnt, 0)->stat)));
+        printk(KERN_CONT "\n");
 
-        printk("\n" KERN_DEBUG "TX ring: CDA=%u EDA=%u DSR=%02X in=%u "
+        printk(KERN_DEBUG "TX ring: CDA=%u EDA=%u DSR=%02X in=%u "
                "last=%u %sactive",
                sca_inw(get_dmac_tx(port) + CDAL, card),
                sca_inw(get_dmac_tx(port) + EDAL, card),
diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c
index 497b003d7239..f099c34a3ae2 100644
--- a/drivers/net/wan/hd64572.c
+++ b/drivers/net/wan/hd64572.c
@@ -529,8 +529,9 @@ static void sca_dump_rings(struct net_device *dev)
                sca_in(DSR_RX(port->chan), card) & DSR_DE ? "" : "in");
         for (cnt = 0; cnt < port->card->rx_ring_buffers; cnt++)
                 printk(" %02X", readb(&(desc_address(port, cnt, 0)->stat)));
+        printk(KERN_CONT "\n");
 
-        printk("\n" KERN_DEBUG "TX ring: CDA=%u EDA=%u DSR=%02X in=%u "
+        printk(KERN_DEBUG "TX ring: CDA=%u EDA=%u DSR=%02X in=%u "
                "last=%u %sactive",
                sca_inl(get_dmac_tx(port) + CDAL, card),
                sca_inl(get_dmac_tx(port) + EDAL, card),
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 545178e6765d..85c02a2ec2e7 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -326,11 +326,9 @@ sbni_pci_probe( struct net_device  *dev )
                 }
 
                 if (pci_irq_line <= 0 || pci_irq_line >= nr_irqs)
-                        printk( KERN_WARNING "  WARNING: The PCI BIOS assigned "
-                                "this PCI card to IRQ %d, which is unlikely "
-                                "to work!.\n"
-                                KERN_WARNING " You should use the PCI BIOS "
-                                "setup to assign a valid IRQ line.\n",
+                        printk( KERN_WARNING
+        "  WARNING: The PCI BIOS assigned this PCI card to IRQ %d, which is unlikely to work!.\n"
+        " You should use the PCI BIOS setup to assign a valid IRQ line.\n",
                                 pci_irq_line );
 
                 /* avoiding re-enable dual adapters */