diff options
author | 2012-01-31 15:13:14 +0100 | |
---|---|---|
committer | 2012-01-31 15:13:14 +0100 | |
commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /drivers/misc/ibmasm/module.c | |
parent | ALSA: HDA: Remove quirk for Toshiba Qosmio G50 (diff) | |
parent | Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into fix/asoc (diff) | |
download | linux-dev-ea51e5040e24eefe44d70bc654a237ca1f0225b0.tar.xz linux-dev-ea51e5040e24eefe44d70bc654a237ca1f0225b0.zip |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'drivers/misc/ibmasm/module.c')
-rw-r--r-- | drivers/misc/ibmasm/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c index a234d965243b..1ccedb71e728 100644 --- a/drivers/misc/ibmasm/module.c +++ b/drivers/misc/ibmasm/module.c @@ -18,7 +18,7 @@ * * Copyright (C) IBM Corporation, 2004 * - * Author: Max Asböck <amax@us.ibm.com> + * Author: Max Asböck <amax@us.ibm.com> * * This driver is based on code originally written by Pete Reynolds * and others. |