Merge tag 'powerpc-3.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jan 2015 01:28:01 +0000 (14:28 +1300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jan 2015 01:28:01 +0000 (14:28 +1300)
Pull powerpc fixes from Michael Ellerman:
 "A few powerpc fixes"

* tag 'powerpc-3.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
  powerpc: Work around gcc bug in current_thread_info()
  cxl: Fix issues when unmapping contexts
  powernv: Fix OPAL tracepoint code


Trivial merge