Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
platform	ACPICA: Make acpi_thread_id no longer configurable, always u64	2010-10-01 01:47:55 -04:00
acexcep.h	ACPICA: Fix namestring associated with AE_NO_HANDLER exception	2010-06-12 00:54:36 -04:00
acnames.h
acoutput.h	ACPICA: Update debug output components	2010-07-06 22:34:27 -04:00
acpi.h
acpi_bus.h	Merge branch 'acpi_pm_device_sleep_state' into release	2010-10-25 02:12:46 -04:00
acpi_drivers.h	ACPI: remove dead code	2010-10-19 13:44:21 -04:00
acpi_numa.h
acpiosxf.h	Merge branch 'misc' into release	2010-10-26 14:51:00 -04:00
acpixf.h	Merge branch 'gpe-defer' into release	2010-10-25 02:13:09 -04:00
acrestyp.h
actbl.h
actbl1.h	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
actbl2.h	ACPICA: Add support for WDDT - Watchdog Descriptor Table	2010-07-06 22:34:27 -04:00
actypes.h	ACPICA: Update math module; no functional change	2010-10-01 01:47:55 -04:00
apei.h
atomicio.h
button.h
container.h
hed.h
pdc_intel.h
processor.h	ACPI processor: remove deprecated ACPI procfs I/F	2010-08-15 00:31:45 -04:00
reboot.h
video.h	ACPI: video: fix build for CONFIG_ACPI=n	2010-12-11 02:01:46 -05:00