diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-04-23 14:30:22 +0200 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-04-23 14:30:22 +0200 |
| commit | a36bf32e9e8a86f291f746b7f8292e042ee04a46 (patch) | |
| tree | c5c999baa4c214218e3adea9b336cbd9f23950ad /drivers/acpi/acpica/nsalloc.c | |
| parent | bc078e4eab65f11bbaeed380593ab8151b30d703 (diff) | |
| parent | 01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f (diff) | |
| download | linux-a36bf32e9e8a86f291f746b7f8292e042ee04a46.tar.gz linux-a36bf32e9e8a86f291f746b7f8292e042ee04a46.tar.bz2 linux-a36bf32e9e8a86f291f746b7f8292e042ee04a46.zip | |
Merge commit 'v2.6.34-rc5' into oprofile/core
Diffstat (limited to 'drivers/acpi/acpica/nsalloc.c')
| -rw-r--r-- | drivers/acpi/acpica/nsalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c index 8a58a1b85aa0..982269c1fa48 100644 --- a/drivers/acpi/acpica/nsalloc.c +++ b/drivers/acpi/acpica/nsalloc.c @@ -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 |