Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Jan 2012 20:26:23 +0000 (12:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Jan 2012 20:26:23 +0000 (12:26 -0800)
commit8e63dd6e1c589ba99a18df9cbaa41c3178607641
treee1662280bb1d8227e767c877c1f06c74ec5c40bc
parentf88609a0e447fb73851c0f640ed47257838ff99f
parentebb7f616abf6ee11603e6b63aa6c5f84c80a17d0
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix unpaired __trace_hcall_entry and __trace_hcall_exit
  powerpc: Fix RCU idle and hcall tracing