diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-07-25 06:31:09 +0200 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-07-25 06:34:40 +0200 |
commit | 6aeea3ecc33b1f36dbc3b80461d15a7052ae424f (patch) | |
tree | bbd273e3e0ca76094aed8e9c77e5adfe2b07f779 /sound/soc/codecs/wm8993.c | |
parent | irqdomain: Fix irq_create_direct_mapping() to test irq_domain type. (diff) | |
parent | Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
download | linux-6aeea3ecc33b1f36dbc3b80461d15a7052ae424f.tar.xz linux-6aeea3ecc33b1f36dbc3b80461d15a7052ae424f.zip |
Merge remote-tracking branch 'origin' into irqdomain/next
Diffstat (limited to 'sound/soc/codecs/wm8993.c')
-rw-r--r-- | sound/soc/codecs/wm8993.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c index 36acfccab999..9fd80d688979 100644 --- a/sound/soc/codecs/wm8993.c +++ b/sound/soc/codecs/wm8993.c @@ -1,7 +1,7 @@ /* * wm8993.c -- WM8993 ALSA SoC audio driver * - * Copyright 2009, 2010 Wolfson Microelectronics plc + * Copyright 2009-12 Wolfson Microelectronics plc * * Author: Mark Brown <broonie@opensource.wolfsonmicro.com> * |