diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-02 15:45:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-02 15:45:44 -0400 |
| commit | 7162f6691e9d39d8d866574687cddb3f1ec65d72 (patch) | |
| tree | c511679caf5c825ede4728870c513f92f4f1616b /drivers/net/wireless/wl12xx/wl1251_cmd.h | |
| parent | 250e061e1d3e26600236a3dd9172e7f5f5916c00 (diff) | |
| parent | 78ab952717b62c0ba6ca7f7a27eaa0486685e45f (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1251_cmd.h')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_cmd.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.h b/drivers/net/wireless/wl12xx/wl1251_cmd.h index 60d7e522486c..e5c74c631374 100644 --- a/drivers/net/wireless/wl12xx/wl1251_cmd.h +++ b/drivers/net/wireless/wl12xx/wl1251_cmd.h | |||
| @@ -4,8 +4,6 @@ | |||
| 4 | * Copyright (c) 1998-2007 Texas Instruments Incorporated | 4 | * Copyright (c) 1998-2007 Texas Instruments Incorporated |
| 5 | * Copyright (C) 2008 Nokia Corporation | 5 | * Copyright (C) 2008 Nokia Corporation |
| 6 | * | 6 | * |
| 7 | * Contact: Kalle Valo <kalle.valo@nokia.com> | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or | 7 | * This program is free software; you can redistribute it and/or |
| 10 | * modify it under the terms of the GNU General Public License | 8 | * modify it under the terms of the GNU General Public License |
| 11 | * version 2 as published by the Free Software Foundation. | 9 | * version 2 as published by the Free Software Foundation. |