Jeff Garzik 8407884dd9 Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream ... Two bits were appended to the end of the bitfield list in struct scsi_device. Resolve that conflict by including both bits. Conflicts: include/scsi/scsi_device.h		2012-07-25 15:58:48 -04:00
..
acpica	ACPICA: Fix possible fault in return package object repair code	2012-07-14 11:38:41 -04:00
apei	ACPI, APEI, Avoid too much error reporting in runtime	2012-06-12 00:17:18 -04:00
ac.c	ACPI: Use struct dev_pm_ops for power management in the AC driver	2012-07-01 13:31:00 +02:00
acpi_ipmi.c
acpi_memhotplug.c
acpi_pad.c	acpi_pad: fix power_saving thread deadlock	2012-06-30 00:51:13 -04:00
battery.c	ACPI: Use struct dev_pm_ops for power management in the battery driver	2012-07-01 13:31:00 +02:00
bgrt.c	acpi, bgrd: Add missing <linux/io.h> to drivers/acpi/bgrt.c	2012-05-17 07:18:26 -07:00
blacklist.c	acpi: delete module.h include from files explicitly not needing it	2011-10-31 19:30:33 -04:00
bus.c	ACPI / PM: Make __acpi_bus_get_power() cover D3cold correctly	2012-05-29 21:20:24 +02:00
button.c	ACPI: Use struct dev_pm_ops for power management in the button driver	2012-07-01 13:31:01 +02:00
cm_sbs.c
container.c
custom_method.c	ACPI: Split out custom_method functionality into an own driver	2011-05-29 01:50:40 -04:00
debugfs.c	acpi: add export.h to files using THIS_MODULE/EXPORT_SYMBOL	2011-10-31 19:30:34 -04:00
dock.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
ec_sys.c	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
ec.c	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-03-30 16:45:39 -07:00
event.c	acpi: add export.h to files using THIS_MODULE/EXPORT_SYMBOL	2011-10-31 19:30:34 -04:00
fan.c	ACPI: Use struct dev_pm_ops for power management in the fan driver	2012-07-01 13:30:59 +02:00
glue.c	drivers/acpi/glue: revert accidental license-related 6b66d95895 bits	2012-07-25 14:24:13 -04:00
hed.c
internal.h	ACPI: Cleanup custom_method debug stuff	2011-05-29 01:50:04 -04:00
Kconfig	drivers: acpi: Fix dependency for ACPI_HOTPLUG_CPU	2012-06-04 00:07:33 -04:00
Makefile	ACPI: Add support for exposing BGRT data	2012-03-30 04:09:24 -04:00
numa.c	ACPI: Store SRAT table revision	2012-01-17 04:19:04 -05:00
nvs.c	ACPI / PM: print physical addresses consistently with other parts of kernel	2012-03-30 02:46:57 -04:00
osl.c	Revert "ACPI: Make ACPI interrupt threaded"	2012-04-18 10:16:27 -07:00
pci_bind.c
pci_irq.c	PCI/PM/Runtime: make PCI traces quieter	2012-01-06 12:11:16 -08:00
pci_link.c	acpi: use KERN_CONT in printk() continuation lines	2012-05-08 08:55:26 -07:00
pci_root.c	PCI/ACPI: provide MMCONFIG address for PCI host bridges	2012-06-22 15:16:51 -06:00
pci_slot.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
power.c	Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream	2012-07-25 15:58:48 -04:00
proc.c	acpi: add export.h to files using THIS_MODULE/EXPORT_SYMBOL	2011-10-31 19:30:34 -04:00
processor_core.c	cpufreq / ACPI: Fix not loading acpi-cpufreq driver regression	2012-07-12 22:39:32 +02:00
processor_driver.c	Merge branch 'pm-acpi'	2012-07-19 00:03:35 +02:00
processor_idle.c	Merge branch 'pm-acpi'	2012-07-19 00:03:35 +02:00
processor_perflib.c	ACPI: Ignore invalid _PSS entries, but use valid ones	2012-05-08 01:56:37 -04:00
processor_thermal.c	ACPI: Do cpufreq clamping for throttling per package v2	2012-03-22 02:16:14 -04:00
processor_throttling.c	ACPI throttling: fix endian bug in acpi_read_throttling_status()	2012-03-30 16:06:12 -04:00
reboot.c	Revert "ACPI: ignore FADT reset-reg-sup flag"	2012-04-20 11:19:35 -07:00
sbs.c	ACPI: Use struct dev_pm_ops for power management in the SBS driver	2012-07-01 13:31:01 +02:00
sbshc.c	acpi: add module.h to files implicitly using/relying on it.	2011-10-31 19:30:32 -04:00
sbshc.h
scan.c	ACPI / PM: Drop PM callbacks from the ACPI bus type	2012-07-01 13:31:06 +02:00
sleep.c	Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream	2012-07-25 15:58:48 -04:00
sleep.h
sysfs.c	ACPI sysfs.c strlen fix	2012-06-05 00:02:05 -04:00
tables.c
thermal.c	ACPI: Use struct dev_pm_ops for power management in the thermal driver	2012-07-01 13:30:59 +02:00
utils.c	ACPI: Add _PLD support	2012-05-11 17:03:12 -07:00
video_detect.c	platform/x86: drop deprecated asus_acpi driver	2012-03-20 12:02:18 -04:00
video.c	Merge branches 'acpi_pad-bugzilla-42981', 'apei-bugzilla-43282', 'video-bugzilla-43168', 'bugzilla-40002' and 'bugfix-misc' into release	2012-06-30 00:53:50 -04:00
wakeup.c	ACPI / Wakeup: Enable button GPEs unconditionally during initialization	2011-02-12 01:39:53 +01:00