Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / acpi / acpi.h

diff --git a/include/acpi/acpi.h b/include/acpi/acpi.h
index a091cabca4b1266f1c3cbdaac7d44f2a4c81be4c..de39915f6b7fb389e8cf2c8b7be73184e1fa8db5 100644 (file)
--- a/include/acpi/acpi.h
+++ b/include/acpi/acpi.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