]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Apr 2012 02:56:04 +0000 (19:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Apr 2012 02:56:04 +0000 (19:56 -0700)
commitf21fec96ead90eae7bcb3c847e8115c119c5dc62
treed60a74cc16aab57f5c8a4a496f0c6e9f33848d45
parenta0421da44fc8dcb94aad8889dae285f7ee923f80
parenteeaab2d8af2cf1d36d7086f22e9de42d6dd2995c
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()
MAINTAINERS