tree e1662280bb1d8227e767c877c1f06c74ec5c40bc
parent f88609a0e447fb73851c0f640ed47257838ff99f
parent ebb7f616abf6ee11603e6b63aa6c5f84c80a17d0
author Linus Torvalds <torvalds@linux-foundation.org> 1326572783 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326572783 -0800

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