Len Brown a733a5da97 Merge branches 'release' and 'fluff' into release ...

Conflicts:

	drivers/acpi/scan.c
	include/linux/acpi.h

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

2008-02-07 03:38:22 -05:00

..

platform

…

acconfig.h

…

acdebug.h

…

acdisasm.h

…

acdispat.h

…

acevents.h

…

acexcep.h

…

acglobal.h

ACPI: create /sys/firmware/acpi/interrupts

2008-02-06 22:27:06 -05:00

achware.h

…

acinterp.h

…

aclocal.h

…

acmacros.h

ACPICA: fix CONFIG_ACPI_DEBUG_FUNC_TRACE build

2008-02-07 03:32:27 -05:00

acnames.h

…

acnamesp.h

…

acobject.h

…

acopcode.h

…

acoutput.h

…

acparser.h

…

acpi_bus.h

Merge branches 'release' and 'video' into release

2008-02-07 03:25:48 -05:00

acpi_drivers.h

Merge branches 'release' and 'fluff' into release

2008-02-07 03:38:22 -05:00

acpi_numa.h

ACPI: misc cleanups

2008-02-07 03:33:23 -05:00

acpi.h

…

acpiosxf.h

Merge branches 'release' and 'hwmon-conflicts' into release

2008-02-07 03:31:17 -05:00

acpixf.h

…

acresrc.h

…

acstruct.h

…

actables.h

…

actbl1.h

…

actbl.h

…

actypes.h

…

acutils.h

…

amlcode.h

…

amlresrc.h

…

container.h

…

pdc_intel.h

…

processor.h

Merge branches 'release' and 'throttling-domains' into release

2008-02-07 03:30:48 -05:00

reboot.h

…