From: David S. Miller <davem@davemloft.net>
Date: Mon, 29 Dec 2008 04:19:47 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.29-rc1~568^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e3c6d4ee545e427b55882d97d3b663c6411645fe;p=linux-2.6-omap-h63xx.git

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

Conflicts:
	arch/sparc64/kernel/idprom.c
---

e3c6d4ee545e427b55882d97d3b663c6411645fe
diff --cc arch/sparc/kernel/idprom.c
index 1b0bd9120c1,223a6582e1e..c16135e0c15
--- a/arch/sparc/kernel/idprom.c
+++ b/arch/sparc/kernel/idprom.c
@@@ -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",
 -	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);
  }