diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h | |
parent | Merge branch 'upstream-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 (diff) | |
parent | staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames. (diff) | |
download | linux-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.xz linux-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h')
-rw-r--r-- | drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h index eb7f101d2d61..ef4d88789d55 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info@addi-data.com * * This program is free software; you can redistribute it and/or modify it |