Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (408 commits)
  [POWERPC] Add memchr() to the bootwrapper
  [POWERPC] Implement logging of unhandled signals
  [POWERPC] Add legacy serial support for OPB with flattened device tree
  [POWERPC] Use 1TB segments
  [POWERPC] XilinxFB: Allow fixed framebuffer base address
  [POWERPC] XilinxFB: Add support for custom screen resolution
  [POWERPC] XilinxFB: Use pdata to pass around framebuffer parameters
  [POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci
  [POWERPC] 4xx: Kilauea defconfig file
  [POWERPC] 4xx: Kilauea DTS
  [POWERPC] 4xx: Add AMCC Kilauea eval board support to platforms/40x
  [POWERPC] 4xx: Add AMCC 405EX support to cputable.c
  [POWERPC] Adjust TASK_SIZE on ppc32 systems to 3GB that are capable
  [POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers
  [POWERPC] 85xx: Enable FP emulation in MPC8560 ADS defconfig
  [POWERPC] 85xx: Killed <asm/mpc85xx.h>
  [POWERPC] 85xx: Add cpm nodes for 8541/8555 CDS
  [POWERPC] 85xx: Convert mpc8560ads to the new CPM binding.
  [POWERPC] mpc8272ads: Remove muram from the CPM reg property.
  [POWERPC] Make clockevents work on PPC601 processors
  ...

Fixed up conflict in Documentation/powerpc/booting-without-of.txt manually.

1 files changed, 20 insertions, 9 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 8a1360045c2d..c4eca56ed5bf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1535,7 +1535,7 @@ P:	Pantelis Antoniou
 M:      pantelis.antoniou@gmail.com
 P:      Vitaly Bordug
 M:      vbordug@ru.mvista.com
-L:      linuxppc-embedded@ozlabs.org
+L:      linuxppc-dev@ozlabs.org
 L:      netdev@vger.kernel.org
 S:      Maintained
 
@@ -1543,14 +1543,14 @@ FREESCALE HIGHSPEED USB DEVICE DRIVER
 P:      Li Yang
 M:      leoli@freescale.com
 L:      linux-usb-devel@lists.sourceforge.net
-L:      linuxppc-embedded@ozlabs.org
+L:      linuxppc-dev@ozlabs.org
 S:      Maintained
 
 FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
 P:      Li Yang
 M:      leoli@freescale.com
 L:      netdev@vger.kernel.org
-L:      linuxppc-embedded@ozlabs.org
+L:      linuxppc-dev@ozlabs.org
 S:      Maintained
 
 FILE LOCKING (flock() and fcntl()/lockf())
@@ -2297,38 +2297,49 @@ S:	Maintained
 LINUX FOR POWERPC EMBEDDED MPC52XX
 P:      Sylvain Munaut
 M:      tnt@246tNt.com
+P:      Grant Likely
+M:      grant.likely@secretlab.ca
 W:      http://www.246tNt.com/mpc52xx/
 W:      http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
-L:      linuxppc-embedded@ozlabs.org
 S:      Maintained
 
 LINUX FOR POWERPC EMBEDDED PPC4XX
+P:      Josh Boyer
+M:      jwboyer@linux.vnet.ibm.com
 P:      Matt Porter
 M:      mporter@kernel.crashing.org
 W:      http://www.penguinppc.org/
-L:      linuxppc-embedded@ozlabs.org
+L:      linuxppc-dev@ozlabs.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc.git
+S:      Maintained
+
+LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
+P:      Grant Likely
+M:      grant.likely@secretlab.ca
+W:      http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
+L:      linuxppc-dev@ozlabs.org
 S:      Maintained
 
 LINUX FOR POWERPC BOOT CODE
 P:      Tom Rini
 M:      trini@kernel.crashing.org
 W:      http://www.penguinppc.org/
-L:      linuxppc-embedded@ozlabs.org
+L:      linuxppc-dev@ozlabs.org
 S:      Maintained
 
 LINUX FOR POWERPC EMBEDDED PPC8XX
 P:      Marcelo Tosatti
 M:      marcelo@kvack.org
 W:      http://www.penguinppc.org/
-L:      linuxppc-embedded@ozlabs.org
+L:      linuxppc-dev@ozlabs.org
 S:      Maintained
 
 LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
 P:      Kumar Gala
 M:      galak@kernel.crashing.org
 W:      http://www.penguinppc.org/
-L:      linuxppc-embedded@ozlabs.org
+L:      linuxppc-dev@ozlabs.org
 S:      Maintained
 
 LINUX FOR POWERPC PA SEMI PWRFICIENT
@@ -2990,7 +3001,7 @@ POWERPC 4xx EMAC DRIVER
 P:      Eugene Surovegin
 M:      ebs@ebshome.net
 W:      http://kernel.ebshome.net/emac/
-L:      linuxppc-embedded@ozlabs.org
+L:      linuxppc-dev@ozlabs.org
 L:      netdev@vger.kernel.org
 S:      Maintained