Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68knommu updates from Greg Ungerer:
"Only a couple of small changes.

Improved the m68knommu MAINTAINERS entry to make it clearer which m68k
parts this applies to, and a print format clean up"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: improve m68knommu MAINTAINERS entry
m68k: Use vsprintf %pM extension

+8 -7
+5 -1
MAINTAINERS
··· 10389 10389 F: Documentation/filesystems/ubifs.txt 10390 10390 F: fs/ubifs/ 10391 10391 10392 - UCLINUX (AND M68KNOMMU) 10392 + UCLINUX (M68KNOMMU AND COLDFIRE) 10393 10393 M: Greg Ungerer <gerg@uclinux.org> 10394 10394 W: http://www.uclinux.org/ 10395 + L: linux-m68k@lists.linux-m68k.org 10395 10396 L: uclinux-dev@uclinux.org (subscribers-only) 10397 + T: git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git 10396 10398 S: Maintained 10399 + F: arch/m68k/coldfire/ 10400 + F: arch/m68k/68*/ 10397 10401 F: arch/m68k/*/*_no.* 10398 10402 F: arch/m68k/include/asm/*_no.* 10399 10403
+1 -2
arch/m68k/68000/m68EZ328.c
··· 62 62 #ifdef CONFIG_UCSIMM 63 63 printk(KERN_INFO "uCsimm serial string [%s]\n",getserialnum()); 64 64 p = cs8900a_hwaddr = gethwaddr(0); 65 - printk(KERN_INFO "uCsimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", 66 - p[0], p[1], p[2], p[3], p[4], p[5]); 65 + printk(KERN_INFO "uCsimm hwaddr %pM\n", p); 67 66 68 67 p = getbenv("APPEND"); 69 68 if (p) strcpy(p,command);
+1 -2
arch/m68k/68000/m68VZ328.c
··· 152 152 153 153 printk(KERN_INFO "uCdimm serial string [%s]\n", getserialnum()); 154 154 p = cs8900a_hwaddr = gethwaddr(0); 155 - printk(KERN_INFO "uCdimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", 156 - p[0], p[1], p[2], p[3], p[4], p[5]); 155 + printk(KERN_INFO "uCdimm hwaddr %pM\n", p); 157 156 p = getbenv("APPEND"); 158 157 if (p) 159 158 strcpy(p, command);
+1 -2
arch/m68k/68360/config.c
··· 154 154 #if defined(CONFIG_UCQUICC) && 0 155 155 printk(KERN_INFO "uCquicc serial string [%s]\n",getserialnum()); 156 156 p = scc1_hwaddr = gethwaddr(0); 157 - printk(KERN_INFO "uCquicc hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", 158 - p[0], p[1], p[2], p[3], p[4], p[5]); 157 + printk(KERN_INFO "uCquicc hwaddr %pM\n", p); 159 158 160 159 p = getbenv("APPEND"); 161 160 if (p)