Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c63f887b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 21dc2e6c e1632fa2

MAINTAINERS

+5 −1
Original line number Original line Diff line number Diff line
@@ -10389,11 +10389,15 @@ S: Maintained 
F:	Documentation/filesystems/ubifs.txt

F:	Documentation/filesystems/ubifs.txt

F:	fs/ubifs/

F:	fs/ubifs/





UCLINUX (AND M68KNOMMU)

UCLINUX (M68KNOMMU AND COLDFIRE)

M:	Greg Ungerer <gerg@uclinux.org>

M:	Greg Ungerer <gerg@uclinux.org>

W:	http://www.uclinux.org/

W:	http://www.uclinux.org/

L:	linux-m68k@lists.linux-m68k.org

L:	uclinux-dev@uclinux.org  (subscribers-only)

L:	uclinux-dev@uclinux.org  (subscribers-only)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git

S:	Maintained

S:	Maintained

F:	arch/m68k/coldfire/

F:	arch/m68k/68*/

F:	arch/m68k/*/*_no.*

F:	arch/m68k/*/*_no.*

F:	arch/m68k/include/asm/*_no.*

F:	arch/m68k/include/asm/*_no.*

arch/m68k/68000/m68EZ328.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -62,8 +62,7 @@ void __init config_BSP(char *command, int len) 
#ifdef CONFIG_UCSIMM

#ifdef CONFIG_UCSIMM

  printk(KERN_INFO "uCsimm serial string [%s]\n",getserialnum());

  printk(KERN_INFO "uCsimm serial string [%s]\n",getserialnum());

  p = cs8900a_hwaddr = gethwaddr(0);

  p = cs8900a_hwaddr = gethwaddr(0);

  printk(KERN_INFO "uCsimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",

  printk(KERN_INFO "uCsimm hwaddr %pM\n", p);

         p[0], p[1], p[2], p[3], p[4], p[5]);





  p = getbenv("APPEND");

  p = getbenv("APPEND");

  if (p) strcpy(p,command);

  if (p) strcpy(p,command);

arch/m68k/68000/m68VZ328.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -152,8 +152,7 @@ static void __init init_hardware(char *command, int size) 




	printk(KERN_INFO "uCdimm serial string [%s]\n", getserialnum());

	printk(KERN_INFO "uCdimm serial string [%s]\n", getserialnum());

	p = cs8900a_hwaddr = gethwaddr(0);

	p = cs8900a_hwaddr = gethwaddr(0);

	printk(KERN_INFO "uCdimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",

	printk(KERN_INFO "uCdimm hwaddr %pM\n", p);

		p[0], p[1], p[2], p[3], p[4], p[5]);

	p = getbenv("APPEND");

	p = getbenv("APPEND");

	if (p)

	if (p)

		strcpy(p, command);

		strcpy(p, command);

arch/m68k/68360/config.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -154,8 +154,7 @@ void __init config_BSP(char *command, int len) 
#if defined(CONFIG_UCQUICC) && 0

#if defined(CONFIG_UCQUICC) && 0

  printk(KERN_INFO "uCquicc serial string [%s]\n",getserialnum());

  printk(KERN_INFO "uCquicc serial string [%s]\n",getserialnum());

  p = scc1_hwaddr = gethwaddr(0);

  p = scc1_hwaddr = gethwaddr(0);

  printk(KERN_INFO "uCquicc hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",

  printk(KERN_INFO "uCquicc hwaddr %pM\n", p);

         p[0], p[1], p[2], p[3], p[4], p[5]);





  p = getbenv("APPEND");

  p = getbenv("APPEND");

  if (p)

  if (p)