Merge branch 'acpica'

* acpica: (63 commits)
  ACPICA: Namespace: Remove _PRP method support.
  ACPI: Fix x86 regression related to early mapping size limitation
  ACPICA: Tables: Add mechanism to control early table checksum verification.
  ACPICA: acpidump: Fix repetitive table dump in -n mode.
  ACPI: Clean up acpi_os_map/unmap_memory() to eliminate __iomem.
  ACPICA: Clean up redudant definitions already defined elsewhere
  ACPICA: Linux headers: Add <asm/acenv.h> to remove mis-ordered inclusion of <asm/acpi.h>
  ACPICA: Linux headers: Add <acpi/platform/aclinuxex.h>
  ACPICA: Linux headers: Remove ACPI_PREEMPTION_POINT() due to no usages.
  ACPICA: Update version to 20140424.
  ACPICA: Comment/format update, no functional change.
  ACPICA: Events: Update GPE handling and initialization code.
  ACPICA: Remove extraneous error message for large number of GPEs.
  ACPICA: Tables: Remove old mechanism to validate if XSDT contains NULL entries.
  ACPICA: Tables: Add new mechanism to skip NULL entries in RSDT and XSDT.
  ACPICA: acpidump: Add support to force using RSDT.
  ACPICA: Back port of improvements on exception code.
  ACPICA: Back port of _PRP update.
  ACPICA: acpidump: Fix truncated RSDP signature validation.
  ACPICA: Linux header: Add support for stubbed externals.
  ...

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/ia64/include/asm/acpi.h
index 2e73dffa16af2ef69e30e9d5bb602442d9b34eb1,b0ddcfd384a4075bcab0b9c648e8ea143f284142..75dc59a793d61ce1f243526764056edd434330bf
--- 1/arch/ia64/include/asm/acpi.h
--- 2/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@@ -34,58 -34,7 +34,8 @@@
  #include <linux/numa.h>
  #include <asm/numa.h>
  
- #define COMPILER_DEPENDENT_INT64      long
- #define COMPILER_DEPENDENT_UINT64     unsigned long
- 
- /*
-  * Calling conventions:
-  *
-  * ACPI_SYSTEM_XFACE        - Interfaces to host OS (handlers, threads)
-  * ACPI_EXTERNAL_XFACE      - External ACPI interfaces
-  * ACPI_INTERNAL_XFACE      - Internal ACPI interfaces
-  * ACPI_INTERNAL_VAR_XFACE  - Internal variable-parameter list interfaces
-  */
- #define ACPI_SYSTEM_XFACE
- #define ACPI_EXTERNAL_XFACE
- #define ACPI_INTERNAL_XFACE
- #define ACPI_INTERNAL_VAR_XFACE
- 
- /* Asm macros */
- 
- #define ACPI_FLUSH_CPU_CACHE()
- 
- static inline int
- ia64_acpi_acquire_global_lock (unsigned int *lock)
- {
-       unsigned int old, new, val;
-       do {
-               old = *lock;
-               new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1));
-               val = ia64_cmpxchg4_acq(lock, new, old);
-       } while (unlikely (val != old));
-       return (new < 3) ? -1 : 0;
- }
- 
- static inline int
- ia64_acpi_release_global_lock (unsigned int *lock)
- {
-       unsigned int old, new, val;
-       do {
-               old = *lock;
-               new = old & ~0x3;
-               val = ia64_cmpxchg4_acq(lock, new, old);
-       } while (unlikely (val != old));
-       return old & 0x1;
- }
- 
- #define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq)                           \
-       ((Acq) = ia64_acpi_acquire_global_lock(&facs->global_lock))
- 
- #define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq)                           \
-       ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock))
- 
  #ifdef        CONFIG_ACPI
 +extern int acpi_lapic;
  #define acpi_disabled 0       /* ACPI always enabled on IA64 */
  #define acpi_noirq 0  /* ACPI always enabled on IA64 */
  #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */

diff --cc drivers/acpi/bus.c
Simple merge