From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 31 Jul 2012 22:33:04 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v3.6-rc1~33
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec7a19bfec544aa73e347369232f9bd654954aa3;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

Pull powerpc updates from Benjamin Herrenschmidt:
 "Kumar sent me a handful of Freescale related fixes and I added another
  regression fix to the pile.

  PS.  I -will- eventually learn about that signed tag business :-)"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/kvm/book3s_32: Fix MTMSR_EERI macro
  powerpc/85xx: p1022ds: fix DIU/LBC switching with NAND enabled
  powerpc/85xx: p1022ds: disable the NAND flash node if video is enabled
  powerpc/85xx: Fix sram_offset parameter type
  powerpc/85xx: P3041DS - change espi input-clock from 40MHz to 35MHz
  powerpc/85xx: Fix pci base address error for p2020rdb-pc in dts
---

ec7a19bfec544aa73e347369232f9bd654954aa3