Merge branch 'for-next' into for-linus

[karo-tx-linux.git] / drivers / acpi / acpica / achware.h

diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
index 36192f142fbb5bdc57997d0600c48284c56878c0..5900f135dc6d93e4bd05d0abbf9ce5e4bea82cba 100644 (file)
--- a/drivers/acpi/acpica/achware.h
+++ b/drivers/acpi/acpica/achware.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without