aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/acpi/acpica/dsutils.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-01-31 15:13:14 +0100
committerTakashi Iwai <tiwai@suse.de>2012-01-31 15:13:14 +0100
commitea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch)
treedf2e5922dcdfafae62a10d8cd97f98121064fc23 /drivers/acpi/acpica/dsutils.c
parentALSA: HDA: Remove quirk for Toshiba Qosmio G50 (diff)
parentMerge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into fix/asoc (diff)
downloadwireguard-linux-ea51e5040e24eefe44d70bc654a237ca1f0225b0.tar.xz
wireguard-linux-ea51e5040e24eefe44d70bc654a237ca1f0225b0.zip
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to '')
-rw-r--r--drivers/acpi/acpica/dsutils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index 2c477ce172fa..1abcda31037f 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without