tree b3b0643bc66fe54c68cb25121c82297c53e42491
parent 64aa90f26c06e1cb2aacfb98a7d0eccfbd6c1a91
parent 396a34340cdf7373c00e3977db27d1a20ea65ebc
author Linus Torvalds <torvalds@linux-foundation.org> 1406572471 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1406572471 -0700

Merge branch 'merge' of git://git.kernel.org/pub/scm/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