Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
David S. Miller [Mon, 29 Dec 2008 04:19:47 +0000 (20:19 -0800)]
Conflicts:
arch/sparc64/kernel/idprom.c

1  2 
Makefile
arch/sparc/kernel/idprom.c
kernel/sysctl.c

diff --cc Makefile
Simple merge
@@@ -95,8 -91,10 +95,5 @@@ void __init idprom_init(void
  
        display_system_type(idprom->id_machtype);
  
-       printk(KERN_WARNING "Ethernet address: %02x:%02x:%02x:%02x:%02x:%02x\n",
-                   idprom->id_ethaddr[0], idprom->id_ethaddr[1],
-                   idprom->id_ethaddr[2], idprom->id_ethaddr[3],
-                   idprom->id_ethaddr[4], idprom->id_ethaddr[5]);
 -      printk("Ethernet address: %x:%x:%x:%x:%x:%x\n",
 -                  idprom->id_ethaddr[0], idprom->id_ethaddr[1],
 -                  idprom->id_ethaddr[2], idprom->id_ethaddr[3],
 -                  idprom->id_ethaddr[4], idprom->id_ethaddr[5]);
++      printk(KERN_WARNING "Ethernet address: %pM\n", idprom->id_ethaddr);
  }
diff --cc kernel/sysctl.c
Simple merge