[git pull] Please pull powerpc.git merge branch

Kumar Gala
2011-04-05T04:31:04Z

The following changes since commit c0bb9e45f3a7f67fc358946727bc3d5f23d0f55d:

kdump: Allow shrinking of kdump region to be overridden (2011-04-01 16:14:30 +1100)

are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge

Kumar Gala (1):
edac/mpc85xx: Limit setting/clearing of HID1[RFXE] to e500v1/v2 cores

Prabhakar Kushwaha (1):
powerpc/85xx: Update dts for PCIe memory maps to match u-boot of Px020RDB

arch/powerpc/boot/dts/p1020rdb.dts | 12 +++++-----
arch/powerpc/boot/dts/p2020rdb.dts | 12 +++++-----
arch/powerpc/boot/dts/p2020rdb_camp_core0.dts | 4 +-
arch/powerpc/boot/dts/p2020rdb_camp_core1.dts | 10 ++++----
drivers/edac/mpc85xx_edac.c | 27 +++++++++++++++++-------
5 files changed, 38 insertions(+), 27 deletions(-)