summaryrefslogtreecommitdiff
path: root/include/acpi/acpixf.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-06-03 10:41:03 +0200
committerIngo Molnar <mingo@elte.hu>2011-06-03 10:41:08 +0200
commit27eb4a1e4a56afacb0540c24084b9e0342f9956b (patch)
tree85bd26c6d7cdee8ee4c2d69d195f3e2bdbbc54fe /include/acpi/acpixf.h
parent64ce312618ef0e11d88def80effcefd1b59fdb1e (diff)
parent55922c9d1b84b89cb946c777fddccb3247e7df2c (diff)
Merge commit 'v3.0-rc1' into perf/core
Merge reason: merge in the latest fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/acpi/acpixf.h')
-rw-r--r--include/acpi/acpixf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index f6ad63d25b73..2ed0a8486c19 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -47,7 +47,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20110316
+#define ACPI_CA_VERSION 0x20110413
#include "actypes.h"
#include "actbl.h"