diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-14 19:08:53 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-14 19:08:53 +0100 |
| commit | b214b7bbffca8ac6a6f1dad46408f7a9d4219098 (patch) | |
| tree | 2ef03e062e2a04ea9f2d5439b0daea5274a1bc98 /drivers/acpi/acpica/rsinfo.c | |
| parent | spi/spidev: Add 32 bit compat ioctl() (diff) | |
| parent | Linux 2.6.38-rc4 (diff) | |
| download | linux-b214b7bbffca8ac6a6f1dad46408f7a9d4219098.tar.xz linux-b214b7bbffca8ac6a6f1dad46408f7a9d4219098.zip | |
Merge commit 'v2.6.38-rc4' into spi/next
Diffstat (limited to 'drivers/acpi/acpica/rsinfo.c')
| -rw-r--r-- | drivers/acpi/acpica/rsinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/rsinfo.c b/drivers/acpi/acpica/rsinfo.c index 1fd868b964fd..f9ea60872aa4 100644 --- a/drivers/acpi/acpica/rsinfo.c +++ b/drivers/acpi/acpica/rsinfo.c @@ -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 |