Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jan 2014 03:59:05 +0000 (10:59 +0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jan 2014 03:59:05 +0000 (10:59 +0700)
commita6da83f98267bc8ee4e34aa899169991eb0ceb93
tree84c228e0a87475dbdb0f72621c137cce8253131b
parent061f49ec2d722f485237870f04544d8bec15a778
parent10348f5976830e5d8f74e8abb04a9a057a5e8478
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

Pull powerpc fix from Ben Herrenschmidt:
 "Here's one regression fix for 3.13 that I would appreciate if you
  could still pull in.  It was an "interesting" one to debug, basically
  it's an old bug that got somewhat "exposed" by new code breaking the
  boot on PA Semi boards (yes, it does appear that some people are still
  using these!)"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Check return value of instance-to-package OF call