From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Oct 2012 18:48:48 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v3.7~250
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0a6a39ecb11cefe0d7e6e07997306fb5ab2b07e;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

Pull powerpc fixes from Benjamin Herrenschmidt:
 "Here are a handful of powerpc related fixes."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.
  cpuidle/powerpc: Fix smt_snooze_delay functionality.
  cpuidle/powerpc: Fix target residency initialisation in pseries cpuidle
  powerpc: Build fix for powerpc KVM
  Revert "powerpc/perf: Use pmc_overflow() to detect rolled back events"
---

a0a6a39ecb11cefe0d7e6e07997306fb5ab2b07e