Linus Torvalds 9a90e09854 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 ... * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (27 commits) ACPI: Don't let acpi_pad needlessly mark TSC unstable drivers/acpi/sleep.h: Checkpatch cleanup ACPI: Minor cleanup eliminating redundant PMTIMER_TICKS to NS conversion ACPI: delete unused c-state promotion/demotion data strucutures ACPI: video: fix acpi_backlight=video ACPI: EC: Use kmemdup drivers/acpi: use kasprintf ACPI, APEI, EINJ injection parameters support Add x64 support to debugfs ACPI, APEI, Use ERST for persistent storage of MCE ACPI, APEI, Error Record Serialization Table (ERST) support ACPI, APEI, Generic Hardware Error Source memory error support ACPI, APEI, UEFI Common Platform Error Record (CPER) header Unified UUID/GUID definition ACPI Hardware Error Device (PNP0C33) support ACPI, APEI, PCIE AER, use general HEST table parsing in AER firmware_first setup ACPI, APEI, Document for APEI ACPI, APEI, EINJ support ACPI, APEI, HEST table parsing ACPI, APEI, APEI supporting infrastructure ...		2010-05-28 14:42:18 -07:00
..
acpica	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-05-28 14:42:18 -07:00
apei	ACPI, APEI, EINJ injection parameters support	2010-05-19 22:42:08 -04:00
ac.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
acpi_memhotplug.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
acpi_pad.c	ACPI: Don't let acpi_pad needlessly mark TSC unstable	2010-05-28 15:34:57 -04:00
atomicio.c	ACPI, IO memory pre-mapping and atomic accessing	2010-05-19 11:40:03 -04:00
battery.c	Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480', 'bugzilla-15521', 'bugzilla-15605', 'gpe-reference-counters', 'misc', 'pxm-fix' and 'video-random-key' into release	2010-04-06 17:06:22 -04:00
blacklist.c	ACPI: disable _OSI(Windows 2009) on Asus K50IJ	2009-12-22 02:39:24 -05:00
bus.c	drivers: acpi: don't use own implementation of hex_to_bin()	2010-05-25 08:07:06 -07:00
button.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
cm_sbs.c	ACPI: Move definition of PREFIX from acpi_bus.h to internal..h	2009-08-28 19:57:27 -04:00
container.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
debug.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dock.c	Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480', 'bugzilla-15521', 'bugzilla-15605', 'gpe-reference-counters', 'misc', 'pxm-fix' and 'video-random-key' into release	2010-04-06 17:06:22 -04:00
ec.c	ACPI: EC: Use kmemdup	2010-05-20 01:02:55 -04:00
event.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
fan.c	ACPI: Remove repeated registered as cooling_device messages	2009-12-16 00:07:10 -05:00
glue.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
hed.c	ACPI Hardware Error Device (PNP0C33) support	2010-05-19 22:40:24 -04:00
internal.h	Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release	2010-03-14 21:30:17 -04:00
Kconfig	ACPI Hardware Error Device (PNP0C33) support	2010-05-19 22:40:24 -04:00
Makefile	ACPI Hardware Error Device (PNP0C33) support	2010-05-19 22:40:24 -04:00
numa.c	ACPI: NUMA: map pxms to low node ids	2010-04-04 00:50:01 -04:00
osl.c	hwmon: (asus_atk0110) Don't load if ACPI resources aren't enforced	2010-05-27 19:58:37 +02:00
pci_bind.c	PCI / ACPI / PM: Platform support for PCI PME wake-up	2010-02-22 16:21:02 -08:00
pci_irq.c	x86, acpi/irq: pci device dev->irq is an isa irq not a gsi	2010-05-04 13:34:30 -07:00
pci_link.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
pci_root.c	Merge branch 'bjorn-pci-root-v4-2.6.35' into release	2010-05-28 16:17:16 -04:00
pci_slot.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
power.c	Merge branch 'master' into for-next	2010-04-23 02:08:44 +02:00
power_meter.c	power_meter: acpi_device_class "power_meter_resource" too long	2010-05-06 02:38:24 -04:00
proc.c	Fix misspellings of "separate" in strings.	2010-02-04 11:55:46 +01:00
processor_core.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
processor_driver.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
processor_idle.c	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-05-28 14:42:18 -07:00
processor_perflib.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
processor_thermal.c	ACPI: Remove unnecessary cast.	2010-01-15 23:06:44 -05:00
processor_throttling.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
reboot.c	ACPI: reboot.c: use new acpi_reset interface	2008-12-31 01:15:00 -05:00
sbs.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sbshc.c	sbshc: acpi_device_class "smbus_host_controller" too long	2010-05-06 02:38:25 -04:00
sbshc.h	ACPI: SBS: Ignore alarms coming from unknown devices	2007-12-14 15:14:06 -05:00
scan.c	ACPICA: Minimize the differences between linux GPE code and ACPICA code base	2010-04-20 10:43:16 -04:00
sleep.c	ACPI: Unconditionally set SCI_EN on resume	2010-05-12 01:12:18 -04:00
sleep.h	drivers/acpi/sleep.h: Checkpatch cleanup	2010-05-28 15:31:33 -04:00
system.c	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
tables.c	ACPI: delete the "acpi=ht" boot option	2010-03-14 20:58:38 -04:00
thermal.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
utils.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
video.c	Merge branch 'misc-2.6.35' into release	2010-05-28 16:18:20 -04:00
video_detect.c	ACPI: video: fix acpi_backlight=video	2010-05-20 01:31:00 -04:00
wakeup.c	ACPI / PM: Add more run-time wake-up fields	2010-02-22 16:20:51 -08:00