summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/rsmemory.c
diff options
context:
space:
mode:
authorLinus Torvalds2010-03-01 19:36:22 +0100
committerLinus Torvalds2010-03-01 19:36:22 +0100
commitbc535154137601400ffe44c2a7be047ca041fe06 (patch)
tree1b6ad05ec2a458d44a384aa90b2ef914c6ce4d52 /drivers/acpi/acpica/rsmemory.c
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff)
parentACPI: replace acpi_integer by u64 (diff)
downloadkernel-qcow2-linux-bc535154137601400ffe44c2a7be047ca041fe06.tar.gz
kernel-qcow2-linux-bc535154137601400ffe44c2a7be047ca041fe06.tar.xz
kernel-qcow2-linux-bc535154137601400ffe44c2a7be047ca041fe06.zip
Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: replace acpi_integer by u64 ACPICA: Update version to 20100121. ACPICA: Remove unused uint32_struct type ACPICA: Disassembler: Remove obsolete "Integer64" field in parse object ACPICA: Remove obsolete ACPI_INTEGER (acpi_integer) type ACPICA: Predefined name repair: fix NULL package elements ACPICA: AcpiGetDevices: Eliminate unnecessary _STA calls ACPICA: Update all ACPICA copyrights and signons to 2010 ACPICA: Update for new gcc-4 warning options
Diffstat (limited to 'drivers/acpi/acpica/rsmemory.c')
-rw-r--r--drivers/acpi/acpica/rsmemory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/rsmemory.c b/drivers/acpi/acpica/rsmemory.c
index ddc76cebdc92..887b8ba8c432 100644
--- a/drivers/acpi/acpica/rsmemory.c
+++ b/drivers/acpi/acpica/rsmemory.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