From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Jan 2012 20:26:23 +0000 (-0800)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8e63dd6e1c589ba99a18df9cbaa41c3178607641;p=mv-sheeva.git

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
---

8e63dd6e1c589ba99a18df9cbaa41c3178607641