summaryrefslogtreecommitdiff
path: root/include/acpi/actbl2.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-20 16:28:34 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-20 16:28:34 -0800
commite589501cb928b482c3c399444f788e1af35deee2 (patch)
tree38737ccf5cadb99478f821ed3ba619993fc60425 /include/acpi/actbl2.h
parent28e58ee8ce1f0e69c207f747b7b9054b071e328d (diff)
parent8d5f0a647395c1323787df675d2805cad54fc89f (diff)
Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPICA: Update version to 20110112 ACPICA: Update all ACPICA copyrights and signons to 2011 ACPICA: Fix issues/fault with automatic "serialized" method support ACPICA: Debugger: Lock namespace for duration of a namespace dump ACPICA: Fix namespace race condition ACPICA: Fix memory leak in acpi_ev_asynch_execute_gpe_method().
Diffstat (limited to 'include/acpi/actbl2.h')
-rw-r--r--include/acpi/actbl2.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index d4136b28011f..0fc15dfb2e22 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without