From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Apr 2012 02:56:04 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f21fec96ead90eae7bcb3c847e8115c119c5dc62;p=linux-beck.git

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

Pull ACPI & Power Management patches from Len Brown:
 "Two fixes for cpuidle merge-window changes, plus a URL fix in
  MAINTAINERS"

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  MAINTAINERS: Update git url for ACPI
  cpuidle: Fix panic in CPU off-lining with no idle driver
  ACPI processor: Use safe_halt() rather than halt() in acpi_idle_play_dead()
---

f21fec96ead90eae7bcb3c847e8115c119c5dc62