summaryrefslogtreecommitdiff
path: root/sound/pci/asihpi/hpimsginit.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2012-01-20 00:56:50 +0400
committerH. Peter Anvin <hpa@linux.intel.com>2012-01-20 00:56:50 +0400
commit282f445a779ed76fca9884fe377bf56a3088b208 (patch)
treed9abcf526baee0100672851e0a8894c19e762a39 /sound/pci/asihpi/hpimsginit.c
parent68f30fbee19cc67849b9fa8e153ede70758afe81 (diff)
parent90a4c0f51e8e44111a926be6f4c87af3938a79c3 (diff)
downloadlinux-282f445a779ed76fca9884fe377bf56a3088b208.tar.xz
Merge remote-tracking branch 'linus/master' into x86/urgent
Diffstat (limited to 'sound/pci/asihpi/hpimsginit.c')
-rw-r--r--sound/pci/asihpi/hpimsginit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/asihpi/hpimsginit.c b/sound/pci/asihpi/hpimsginit.c
index 52400a6b5f15..032d563e3708 100644
--- a/sound/pci/asihpi/hpimsginit.c
+++ b/sound/pci/asihpi/hpimsginit.c
@@ -1,7 +1,7 @@
/******************************************************************************
AudioScience HPI driver
- Copyright (C) 1997-2010 AudioScience Inc. <support@audioscience.com>
+ Copyright (C) 1997-2011 AudioScience Inc. <support@audioscience.com>
This program is free software; you can redistribute it and/or modify
it under the terms of version 2 of the GNU General Public License as