diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-12-13 19:14:28 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-12-13 19:14:28 +0100 |
commit | f647a52e1576f9c92cc9c02d5756cd0207295a2b (patch) | |
tree | 9e8e69dd01504fad5523c99d7e125e8ff865b65c /drivers/net/wireless/libertas/README | |
parent | ipv6: fix incorrect type in declaration (diff) | |
parent | ath9k: initialize retry chain flags in tx99 code (diff) | |
download | linux-f647a52e1576f9c92cc9c02d5756cd0207295a2b.tar.xz linux-f647a52e1576f9c92cc9c02d5756cd0207295a2b.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/libertas/README')
-rw-r--r-- | drivers/net/wireless/libertas/README | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/README b/drivers/net/wireless/libertas/README index 91f2ca90c70f..1a554a685e91 100644 --- a/drivers/net/wireless/libertas/README +++ b/drivers/net/wireless/libertas/README @@ -8,9 +8,8 @@ Ltd. under the terms of the GNU General Public License Version 2, June 1991 (the "License"). You may use, redistribute and/or modify this File in accordance with the terms and conditions of the License, a copy of which - is available along with the File in the license.txt file or by writing to - the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 or on the worldwide web at http://www.gnu.org/licenses/gpl.txt. + is available along with the File in the license.txt file or on the worldwide + web at http://www.gnu.org/licenses/gpl.txt. THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE |