]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Nov 2014 02:23:41 +0000 (18:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Nov 2014 02:23:41 +0000 (18:23 -0800)
commit21f122f47205258e166479e1223898941c6aa6a1
tree2bb3b86ed6b22fbea6864654642167244707200e
parentae979430e3e2ac23ae44c37077f1171ff5829d7b
parent152d44a853e42952f6c8a504fb1f8eefd21fd5fd
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc fixes from Michael Ellerman:
 "Here are five fixes for you to pull please.

  They're all CC'ed to stable except the "Fix PE state format" one which
  went in this release"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
  powerpc: 32 bit getcpu VDSO function uses 64 bit instructions
  powerpc/powernv: Replace OPAL_DEASSERT_RESET with EEH_RESET_DEACTIVATE
  powerpc/eeh: Fix PE state format
  powerpc/pseries: Fix endiannes issue in RTAS call from xmon
  powerpc/powernv: Fix the hmi event version check.
arch/powerpc/platforms/powernv/pci-ioda.c