Merge branch 'master' into upstream

[linux-2.6] / include / acpi / acglobal.h

diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h
index dfb3b2493ae5de231859c21611354c1524280c8f..734cc77bf2c7ae885e82209b14c85d40cab6d04d 100644 (file)
--- a/include/acpi/acglobal.h
+++ b/include/acpi/acglobal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without