summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/exresnte.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-01-23 18:22:16 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2011-01-24 19:27:32 +0100
commit8a327f23e23fa509e6e3c2263ae1cc0a67dec387 (patch)
tree119abf09e1ec9babaf78e6889187f9d54864b118 /drivers/acpi/acpica/exresnte.c
parentdrm/i915: Handle the no-interrupts case for UMS by polling (diff)
parentMerge branch 'BUG_ON' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/... (diff)
downloadlinux-8a327f23e23fa509e6e3c2263ae1cc0a67dec387.tar.xz
linux-8a327f23e23fa509e6e3c2263ae1cc0a67dec387.zip
Merge remote branch 'linus/master' into drm-intel-fixes
Merge with Linus to resolve conflicting fixes for the reusing the stale HEAD value during intel_ring_wait(). Conflicts: drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'drivers/acpi/acpica/exresnte.c')
-rw-r--r--drivers/acpi/acpica/exresnte.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/exresnte.c b/drivers/acpi/acpica/exresnte.c
index 1fa4289a687e..55997e46948b 100644
--- a/drivers/acpi/acpica/exresnte.c
+++ b/drivers/acpi/acpica/exresnte.c
@@ -6,7 +6,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