Linus Torvalds ff39d0e8f0 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux ... Pull ACPI and Power Management changes from Len Brown. This does an evil merge to fix up what I think is a mismerge by Len to the gma500 driver, and restore it to the mainline state. In that driver, both branches had commented out the call to acpi_video_register(), and Len resolved the merge to that commented-out version. However, in mainline, further changes by Alan (commit d839ede47a: "gma500: opregion and ACPI" to be exact) had re-enabled the ACPI video registration, so the current state of the driver seems to want it. Alan is apparently still feeling the effects of partying with the Queen, so he didn't reply to my query, but I'll do the evil merge anyway. * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: ACPI: fix acpi_bus.h build warnings when ACPI is not enabled drivers: acpi: Fix dependency for ACPI_HOTPLUG_CPU tools/power turbostat: fix IVB support tools/power turbostat: fix un-intended affinity of forked program ACPI video: use after input_unregister_device() gma500: don't register the ACPI video bus acpi_video: Intel video is not always i915 acpi_video: fix leaking PCI references ACPI: Ignore invalid _PSS entries, but use valid ones ACPI battery: only refresh the sysfs files when pertinent information changes		2012-06-06 10:47:15 -07:00
..
acpi	ACPI: fix acpi_bus.h build warnings when ACPI is not enabled	2012-06-04 00:29:11 -04:00
asm-generic	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-06-01 10:34:35 -07:00
crypto
drm	drm/radeon/kms: add new SI PCI ids	2012-06-05 15:11:12 +01:00
keys
linux	Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux	2012-06-05 10:55:31 -07:00
math-emu
media
memory
misc
mtd
net	cipso: handle CIPSO options correctly when NetLabel is disabled	2012-06-01 14:18:29 -04:00
pcmcia
rdma
rxrpc
scsi
sound
target
trace	mm: vmscan: remove reclaim_mode_t	2012-05-29 16:22:19 -07:00
video	fbdev updates for 3.5	2012-06-01 16:57:51 -07:00
xen
Kbuild