[git pull] Please pull powerpc.git merge branch

Kumar Gala
2012-07-27T12:45:08Z

Ben,

A few patches that missed the initial 3.6 window. These are bug fixes at
this point.

- k

The following changes since commit 574ce79cea9d3fda109ffcc82f81733de4740e5c:

powerpc/mpic: Create a revmap with enough entries for IPIs and timers (2012-07-23 14:20:42 +1000)

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

Claudiu Manoil (1):
powerpc/85xx: Fix sram_offset parameter type

Shaohui Xie (1):
powerpc/85xx: P3041DS - change espi input-clock from 40MHz to 35MHz

Tang Yuantian (1):
powerpc/85xx: Fix pci base address error for p2020rdb-pc in dts

Timur Tabi (2):
powerpc/85xx: p1022ds: disable the NAND flash node if video is enabled
powerpc/85xx: p1022ds: fix DIU/LBC switching with NAND enabled

arch/powerpc/boot/dts/p2020rdb-pc_32b.dts | 4 +-
arch/powerpc/boot/dts/p2020rdb-pc_36b.dts | 4 +-
arch/powerpc/boot/dts/p3041ds.dts | 2 +-
arch/powerpc/platforms/85xx/p1022_ds.c | 122 +++++++++++++++++++++++-----
arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h | 4 +-
arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 39 ++++------
6 files changed, 121 insertions(+), 54 deletions(-)