Len Brown ec612fcf43 Merge branch 'd3' into release ...

Conflicts:
	drivers/acpi/sleep.c

This was a text conflict between
a2ef5c4fd44ce3922435139393b89f2cce47f576
(ACPI: Move module parameter gts and bfs to sleep.c)

which added #include <linux/module.h>

and

b24e5098853653554baf6ec975b9e855f3d6e5c0
(ACPI, PCI: Move acpi_dev_run_wake() to ACPI core)

which added #include <linux/pm_runtime.h>

The resolution was to take them both.

Signed-off-by: Len Brown <len.brown@intel.com>

2012-03-30 16:21:26 -04:00

..

acpica

Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug', 'misc', 'red-hat-bz-727865', 'thermal', 'throttling', 'turbostat' and 'video' into release

2012-03-30 16:10:37 -04:00

apei

Merge branch 'apei' into release

2012-03-30 16:14:02 -04:00

ac.c

treewide: fix potentially dangerous trailing ';' in #defined values/expressions

2011-07-21 14:10:00 +02:00

acpi_ipmi.c

IPMI/ACPI: Add the IPMI opregion driver to enable ACPI to access BMC controller

2010-12-14 00:22:14 -05: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: minor printk format change in acpi_pad

2011-03-23 01:36:45 -04:00

battery.c

switch procfs to umode_t use

2012-01-03 22:54:56 -05:00

bgrt.c

ACPI: Add support for exposing BGRT data

2012-03-30 04:09:24 -04: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: export acpi_kobj

2012-03-30 04:09:05 -04:00

button.c

ACPI button: remove unused procfs I/F

2011-03-22 23:20:35 -04: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

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

switch debugfs to umode_t

2012-01-03 22:54:56 -05:00

ec.c

ACPI: ec: Do request_region outside WARN()

2012-03-30 01:41:35 -04: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: constify ops structs

2011-07-16 18:36:17 -04:00

glue.c

acpi: add export.h to files using THIS_MODULE/EXPORT_SYMBOL

2011-10-31 19:30:34 -04:00

hed.c

ACPI Hardware Error Device (PNP0C33) support

2010-05-19 22:40:24 -04:00

internal.h

ACPI: Cleanup custom_method debug stuff

2011-05-29 01:50:04 -04:00

Kconfig

ACPI: Add support for exposing BGRT data

2012-03-30 04:09:24 -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

Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug', 'misc', 'red-hat-bz-727865', 'thermal', 'throttling', 'turbostat' and 'video' into release

2012-03-30 16:10:37 -04: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

PCI/PM/Runtime: make PCI traces quieter

2012-01-06 12:11:16 -08:00

pci_link.c

ACPI: Use syscore_ops instead of sysdev class and sysdev

2011-03-18 18:22:21 -04:00

pci_root.c

PCI: Rework ASPM disable code

2012-01-06 12:10:26 -08:00

pci_slot.c

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

power.c

ACPI: Add interface to register/unregister device to/from power resources

2012-03-30 01:47:20 -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

ACPI: processor: fix acpi_get_cpuid for UP processor

2012-01-17 05:25:08 -05:00

processor_driver.c

Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug', 'misc', 'red-hat-bz-727865', 'thermal', 'throttling', 'turbostat' and 'video' into release

2012-03-30 16:10:37 -04:00

processor_idle.c

Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug', 'misc', 'red-hat-bz-727865', 'thermal', 'throttling', 'turbostat' and 'video' into release

2012-03-30 16:10:37 -04:00

processor_perflib.c

[CPUFREQ] use dynamic debug instead of custom infrastructure

2011-05-04 11:50:57 -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

ACPI: ignore FADT reset-reg-sup flag

2012-03-21 00:46:39 -04:00

sbs.c

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2011-08-02 21:17:02 -10:00

sbshc.c

acpi: add module.h to files implicitly using/relying on it.

2011-10-31 19:30:32 -04:00

sbshc.h

ACPI: SBS: Ignore alarms coming from unknown devices

2007-12-14 15:14:06 -05:00

scan.c

Merge branch 'd3' into release

2012-03-30 16:21:26 -04:00

sleep.c

Merge branch 'd3' into release

2012-03-30 16:21:26 -04:00

sleep.h

ACPI: static sleep_states[] and acpi_gts_bfs_check

2010-10-19 13:44:37 -04:00

sysfs.c

ACPI: Export FADT pm_profile integer value to userspace

2011-11-06 20:48:42 -05:00

tables.c

ACPI: delete the "acpi=ht" boot option

2010-03-14 20:58:38 -04:00

thermal.c

ACPI: Evaluate thermal trip points before reading temperature

2012-03-30 02:38:31 -04: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_detect.c

acpi: add export.h to files using THIS_MODULE/EXPORT_SYMBOL

2011-10-31 19:30:34 -04:00

video.c

ACPI video: Don't start video device until its associated input device has been allocated

2012-03-30 15:47:52 -04:00

wakeup.c

ACPI / Wakeup: Enable button GPEs unconditionally during initialization

2011-02-12 01:39:53 +01:00