diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-03 14:24:46 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-03 14:24:46 -0400 |
| commit | 447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6 (patch) | |
| tree | 676e741f2552c9cb301e1e49c557b92bf8940f55 /drivers/net/wireless/mwifiex/usb.c | |
| parent | 3049683eafdbbbd7350b0e5ca02a2d8c026a3362 (diff) | |
| parent | 042e1c79166b9250edd8262bea84e1703f27ad2e (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.18.
Diffstat (limited to 'drivers/net/wireless/mwifiex/usb.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/usb.c b/drivers/net/wireless/mwifiex/usb.c index a8ce8130cfae..7118a18b91ba 100644 --- a/drivers/net/wireless/mwifiex/usb.c +++ b/drivers/net/wireless/mwifiex/usb.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Marvell Wireless LAN device driver: USB specific handling | 2 | * Marvell Wireless LAN device driver: USB specific handling |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2012, Marvell International Ltd. | 4 | * Copyright (C) 2012-2014, Marvell International Ltd. |
| 5 | * | 5 | * |
| 6 | * This software file (the "File") is distributed by Marvell International | 6 | * This software file (the "File") is distributed by Marvell International |
| 7 | * Ltd. under the terms of the GNU General Public License Version 2, June 1991 | 7 | * Ltd. under the terms of the GNU General Public License Version 2, June 1991 |