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

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (867 commits)
  [SKY2]: status polling loop (post merge)
  [NET]: Fix NAPI completion handling in some drivers.
  [TCP]: Limit processing lost_retrans loop to work-to-do cases
  [TCP]: Fix lost_retrans loop vs fastpath problems
  [TCP]: No need to re-count fackets_out/sacked_out at RTO
  [TCP]: Extract tcp_match_queue_to_sack from sacktag code
  [TCP]: Kill almost unused variable pcount from sacktag
  [TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L
  [TCP]: Add bytes_acked (ABC) clearing to FRTO too
  [IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2
  [NETFILTER]: x_tables: add missing ip6t_modulename aliases
  [NETFILTER]: nf_conntrack_tcp: fix connection reopening
  [QETH]: fix qeth_main.c
  [NETLINK]: fib_frontend build fixes
  [IPv6]: Export userland ND options through netlink (RDNSS support)
  [9P]: build fix with !CONFIG_SYSCTL
  [NET]: Fix dev_put() and dev_hold() comments
  [NET]: make netlink user -> kernel interface synchronious
  [NET]: unify netlink kernel socket recognition
  [NET]: cleanup 3rd argument in netlink_sendskb
  ...

Fix up conflicts manually in Documentation/feature-removal-schedule.txt
and my new least favourite crap, the "mod_devicetable" support in the
files include/linux/mod_devicetable.h and scripts/mod/file2alias.c.

(The latter files seem to be explicitly _designed_ to get conflicts when
different subsystems work with them - that have an absolutely horrid
lack of subsystem separation!)

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index 644c408515df..5136d94923aa 100644
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -103,8 +103,6 @@ static int __init do_ac3200_probe(struct net_device *dev)
         int irq = dev->irq;
         int mem_start = dev->mem_start;
 
-        SET_MODULE_OWNER(dev);
-
         if (ioaddr > 0x1ff)             /* Check a single specified location. */
                 return ac_probe1(ioaddr, dev);
         else if (ioaddr > 0)            /* Don't probe at all. */
@@ -148,6 +146,7 @@ out:
 static int __init ac_probe1(int ioaddr, struct net_device *dev)
 {
         int i, retval;
+        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, AC_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -169,10 +168,11 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev)
                    inb(ioaddr + AC_ID_PORT + 2), inb(ioaddr + AC_ID_PORT + 3));
 #endif
 
-        printk("AC3200 in EISA slot %d, node", ioaddr/0x1000);
-        for(i = 0; i < 6; i++)
-                printk(" %02x", dev->dev_addr[i] = inb(ioaddr + AC_SA_PROM + i));
+        for (i = 0; i < 6; i++)
+                dev->dev_addr[i] = inb(ioaddr + AC_SA_PROM + i);
 
+        printk(KERN_DEBUG "AC3200 in EISA slot %d, node %s",
+               ioaddr/0x1000, print_mac(mac, dev->dev_addr));
 #if 0
         /* Check the vendor ID/prefix. Redundant after checking the EISA ID */
         if (inb(ioaddr + AC_SA_PROM + 0) != AC_ADDR0