From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Jul 2014 18:34:31 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v3.16~23
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=e8a91e0e872c52d2af62ae2cf30b6aef1da1ae52;p=cascardo%2Flinux.git

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

Pull powerpc fixes from Ben Herrenschmidt:
 "Here are 3 more small powerpc fixes that should still go into .16.

  One is a recent regression (MMCR2 business), the other is a trivial
  endian fix without which FW updates won't work on LE in IBM machines,
  and the 3rd one turns a BUG_ON into a WARN_ON which is definitely a
  LOT more friendly especially when the whole thing is about retrieving
  error logs ..."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix endianness of flash_block_list in rtas_flash
  powerpc/powernv: Change BUG_ON to WARN_ON in elog code
  powerpc/perf: Fix MMCR2 handling for EBB
---

e8a91e0e872c52d2af62ae2cf30b6aef1da1ae52