Len Brown 73f0533049 Merge branch 'apei' into release ... Conflicts: drivers/acpi/apei/apei-base.c This was a conflict between 15afae6046 (CPI, APEI: Fix incorrect APEI register bit width check and usage) and 653f4b538f (ACPICA: Expand OSL memory read/write interfaces to 64 bits) The former changed a parameter in the call to acpi_os_read_memory64() and the later replaced all calls to acpi_os_read_memory64() with calls to acpi_os_read_memory(). Signed-off-by: Len Brown <len.brown@intel.com>		2012-03-30 16:14:02 -04:00
..
apei-base.c	Merge branch 'apei' into release	2012-03-30 16:14:02 -04:00
apei-internal.h
cper.c	CPER failed to handle generic error records with multiple sections	2012-03-30 04:01:26 -04:00
einj.c	ACPI, APEI, EINJ, new parameter to control trigger action	2012-03-30 03:30:18 -04:00
erst-dbg.c
erst.c	ACPI, APEI, Fix ERST header length check	2012-03-30 03:30:17 -04:00
ghes.c	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-01-18 15:51:48 -08:00
hest.c	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-01-18 15:51:48 -08:00
Kconfig
Makefile