From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Dec 2011 01:17:41 +0000 (+1100)
Subject: Merge remote-tracking branch '4xx/next'
X-Git-Tag: next-20111213~81
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=052e678e684592e10188684be5f8e318542745b4;p=karo-tx-linux.git

Merge remote-tracking branch '4xx/next'

Conflicts:
	arch/powerpc/platforms/40x/ppc40x_simple.c
---

052e678e684592e10188684be5f8e318542745b4
diff --cc arch/powerpc/platforms/40x/ppc40x_simple.c
index ecac237827ef,2f8fde6521ea..97612068fae3
--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
@@@ -55,8 -55,8 +55,9 @@@ static const char *board[] __initdata 
  	"amcc,haleakala",
  	"amcc,kilauea",
  	"amcc,makalu",
+ 	"apm,klondike",
 -	"est,hotfoot"
 +	"est,hotfoot",
 +	"plathome,obs600"
  };
  
  static int __init ppc40x_probe(void)