summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds2012-04-07 04:56:04 +0200
committerLinus Torvalds2012-04-07 04:56:04 +0200
commitf21fec96ead90eae7bcb3c847e8115c119c5dc62 (patch)
treed60a74cc16aab57f5c8a4a496f0c6e9f33848d45 /kernel
parentMerge branch '3.4-rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentMerge branches 'idle-fix' and 'misc' into release (diff)
downloadkernel-qcow2-linux-f21fec96ead90eae7bcb3c847e8115c119c5dc62.tar.gz
kernel-qcow2-linux-f21fec96ead90eae7bcb3c847e8115c119c5dc62.tar.xz
kernel-qcow2-linux-f21fec96ead90eae7bcb3c847e8115c119c5dc62.zip
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()
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions