diff options
author | 2012-01-12 09:59:14 +0100 | |
---|---|---|
committer | 2012-01-12 09:59:14 +0100 | |
commit | 627b79628f56c3deeb17dec1edf6899b49552fa4 (patch) | |
tree | deac8b2cce5d70708fa944a270ee031f069226d8 /sound/pci/asihpi/hpimsginit.h | |
parent | Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broon... (diff) | |
parent | ALSA: usb-audio: add Yamaha MOX6/MOX8 support (diff) | |
download | linux-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.gz linux-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.bz2 linux-627b79628f56c3deeb17dec1edf6899b49552fa4.zip |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/asihpi/hpimsginit.h')
-rw-r--r-- | sound/pci/asihpi/hpimsginit.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/asihpi/hpimsginit.h b/sound/pci/asihpi/hpimsginit.h index bfd330d78b58..5b48708c7d1e 100644 --- a/sound/pci/asihpi/hpimsginit.h +++ b/sound/pci/asihpi/hpimsginit.h @@ -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 |