Please pull 'merge' branch of 4xx tree

Please pull 'merge' branch of 4xx tree

[Josh Boyer]

Hi Ben,

Below are some simple defconfig updates for 4xx for 2.6.33.  Please pull them
before you send the next batch to Linus.

Thanks,
josh

The following changes since commit 95cd34b42b43c0ed5a89a764e023189bfe7b1530:
  Albert Herranz (1):
        powerpc/gc/wii: Remove get_irq_desc()

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git merge

Josh Boyer (2):
      powerpc/44x: Update PowerPC 44x board defconfigs
      powerpc/40x: Update the PowerPC 40x board defconfigs

 arch/powerpc/configs/40x/acadia_defconfig      |  241 ++++++++++++++-----
 arch/powerpc/configs/40x/ep405_defconfig       |  307 ++++++++++++++++++------
 arch/powerpc/configs/40x/hcu4_defconfig        |  256 +++++++++++++++-----
 arch/powerpc/configs/40x/kilauea_defconfig     |  140 ++++++++---
 arch/powerpc/configs/40x/makalu_defconfig      |  190 ++++++++++-----
 arch/powerpc/configs/40x/walnut_defconfig      |  257 +++++++++++++++-----
 arch/powerpc/configs/44x/arches_defconfig      |  135 ++++++++---
 arch/powerpc/configs/44x/bamboo_defconfig      |  255 +++++++++++++++-----
 arch/powerpc/configs/44x/canyonlands_defconfig |  141 ++++++++---
 arch/powerpc/configs/44x/ebony_defconfig       |  258 +++++++++++++++-----
 arch/powerpc/configs/44x/eiger_defconfig       |  128 +++++++---
 arch/powerpc/configs/44x/katmai_defconfig      |  253 +++++++++++++++-----
 arch/powerpc/configs/44x/rainier_defconfig     |  254 +++++++++++++++-----
 arch/powerpc/configs/44x/redwood_defconfig     |  274 +++++++++++++++------
 arch/powerpc/configs/44x/sam440ep_defconfig    |  284 +++++++++++++++-------
 arch/powerpc/configs/44x/sequoia_defconfig     |  202 +++++++++++-----
 arch/powerpc/configs/44x/taishan_defconfig     |  258 +++++++++++++++-----
 arch/powerpc/configs/44x/warp_defconfig        |  228 ++++++++++++------
 arch/powerpc/configs/ppc40x_defconfig          |  292 ++++++++++++++++-------
 arch/powerpc/configs/ppc44x_defconfig          |  309 +++++++++++++++++-------
 20 files changed, 3391 insertions(+), 1271 deletions(-)

Please pull 'merge' branch of 4xx tree

[Josh Boyer]

Hi Ben,

The changes from Dave for 47x (with minor fix), and a device tree update
for the 460ex SATA driver that has been merged upstream now.  Please
pull.

josh

The following changes since commit
e32e78c5ee8aadef020fbaecbe6fb741ed9029fd:

  powerpc: fix build with make 3.82 (2010-08-09 14:14:05 +1000)

are available in the git repository at:
  ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
merge

Dave Kleikamp (4):
      powerpc/47x: Make sure mcsr is cleared before enabling machine
check interrupts
      powerpc/47x: Remove redundant line from cputable.c
      powerpc/4xx: Index interrupt stacks by physical cpu
      powerpc/47x: Add an isync before the tlbivax instruction

Rupjyoti Sarmah (1):
      powerpc/4xx: Device tree update for the 460ex DWC SATA

 arch/powerpc/boot/dts/canyonlands.dts |    8 ++++++++
 arch/powerpc/kernel/cputable.c        |    1 -
 arch/powerpc/kernel/head_44x.S        |    4 ++++
 arch/powerpc/kernel/irq.c             |   16 +++++++++-------
 arch/powerpc/kernel/setup_32.c        |    9 +++++----
 arch/powerpc/mm/tlb_nohash_low.S      |    1 +
 6 files changed, 27 insertions(+), 12 deletions(-)

Please pull 'merge' branch of 4xx tree

[Josh Boyer]

Hi Ben,

Two small fixes that should go into 2.6.35.  Please pull them and shuffle along
to Linus.  I know Linus is leaving for a while at the end of this week, so if
you want me to ask him to pull directly just let me know.

josh

The following changes since commit c2cdf6aba0dfcfb54be646ab630c1bccd180e890:
  Benjamin Herrenschmidt (1):
        powerpc/macio: Fix probing of macio devices by using the right of match table

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git merge

Christoph Egger (1):
      powerpc/47x: Correct typo in ifdef guard for 47x

Stefan Roese (1):
      powerpc/44x: Fix UART2/3 interrupt assignment in PPC460EX/GT dts files

 arch/powerpc/boot/dts/canyonlands.dts |    4 ++--
 arch/powerpc/boot/dts/glacier.dts     |    4 ++--
 arch/powerpc/mm/44x_mmu.c             |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

Please pull 'merge' branch of 4xx tree

[Josh Boyer]

Hi Ben,

Please pull the fixes below from the 4xx tree.  A few Warp platform updates
that should fix the final issues Sean has reported.

thx,
josh

The following changes since commit fd0cca754f3f6756bfdafe500e4f49b1b9e9723f:
  Benjamin Herrenschmidt (1):
        Merge commit 'kumar/next' into merge

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git merge

Josh Boyer (1):
      powerpc/44x: Fix build error with -Werror for Warp platform

Sean MacLennan (2):
      powerpc/44x: Update Warp defconfig
      powerpc/4xx: Have Warp take advantage of GPIO LEDs default-state = keep

 arch/powerpc/boot/dts/warp.dts          |    3 +-
 arch/powerpc/configs/44x/warp_defconfig |  200 ++++++++++++++++++++++++-------
 arch/powerpc/platforms/44x/warp.c       |   19 +--
 3 files changed, 166 insertions(+), 56 deletions(-)

Please pull 'merge' branch of 4xx tree

[Josh Boyer]

Hi Paul,

I have one more small fix for 2.6.28 in my merge branch.  It fixes
an assembler error with some toolchains, notably ELDK.  I've CC'd
Linus in case you don't have anything else pending at the moment.

josh

The following changes since commit ab44f4627e2160cddbddbe8aa8b1d2b2e1559790:
  Paul Mackerras (1):
        Merge branch 'merge' of master.kernel.org:/.../galak/powerpc into merge

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git merge

Josh Boyer (1):
      powerpc/40x: Add proper BOOTCFLAGS for cuboot-acadia

 arch/powerpc/boot/Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Please pull 'merge' branch of 4xx tree

[Josh Boyer]

Hi Paul,

Please pull the 'merge' branch of the 4xx tree to pick up the fix below.
Once it's in Linus' tree, I'll submit it to -stable as we need the same
fix in .27.

josh

The following changes since commit feaf3848a813a106f163013af6fcf6c4bfec92d9:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git merge

Grant Likely (1):
      powerpc/virtex5: Fix Virtex5 machine check handling

 arch/powerpc/kernel/cpu_setup_44x.S |    1 +
 arch/powerpc/kernel/cputable.c      |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

Please pull 'merge' branch of 4xx tree

[Josh Boyer]

Hi Paul,

Please pull the changes below as updates for 2.6.28.  There is one small
Kconfig fix, and the normal defconfig updates we do every release.

thx,
josh

The following changes since commit 0173a3265b228da319ceb9c1ec6a5682fd1b2d92:
  Linus Torvalds (1):
        Linux 2.6.28-rc2

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git merge

Josh Boyer (3):
      powerpc/40x: Don't enable HCU4 board by default
      powerpc/40x: Update 40x defconfigs
      powerpc/44x: Update 44x defconfigs

 arch/powerpc/configs/40x/acadia_defconfig      |   59 ++++++++----
 arch/powerpc/configs/40x/ep405_defconfig       |   83 +++++++++++-----
 arch/powerpc/configs/40x/hcu4_defconfig        |  125 +++++++++++++++++-------
 arch/powerpc/configs/40x/kilauea_defconfig     |   69 +++++++++----
 arch/powerpc/configs/40x/makalu_defconfig      |   69 +++++++++----
 arch/powerpc/configs/40x/walnut_defconfig      |   77 +++++++++++----
 arch/powerpc/configs/44x/arches_defconfig      |   51 ++++++----
 arch/powerpc/configs/44x/bamboo_defconfig      |   77 +++++++++++----
 arch/powerpc/configs/44x/canyonlands_defconfig |   61 ++++++++----
 arch/powerpc/configs/44x/ebony_defconfig       |   77 +++++++++++----
 arch/powerpc/configs/44x/katmai_defconfig      |   77 +++++++++++----
 arch/powerpc/configs/44x/rainier_defconfig     |   73 ++++++++++----
 arch/powerpc/configs/44x/sam440ep_defconfig    |  110 +++++++++++++++------
 arch/powerpc/configs/44x/sequoia_defconfig     |   78 +++++++++++----
 arch/powerpc/configs/44x/taishan_defconfig     |   77 +++++++++++----
 arch/powerpc/configs/44x/warp_defconfig        |   82 +++++++++++-----
 arch/powerpc/configs/ppc40x_defconfig          |  106 ++++++++++++++++----
 arch/powerpc/configs/ppc44x_defconfig          |  125 ++++++++++++++++++------
 arch/powerpc/platforms/40x/Kconfig             |    2 +-
 19 files changed, 1053 insertions(+), 425 deletions(-)