diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-30 23:23:08 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-30 23:23:08 +0400 |
| commit | 1698c6db420bc131d4b34bc39913ee817aa47312 (patch) | |
| tree | 8aeb9e25bba5d4cc3a893827d30913d83ea32fdf /drivers/net/wireless/iwlwifi/dvm/mac80211.c | |
| parent | 20fb9e50338199d9e88512703af4c560ab53bad4 (diff) | |
| parent | d13f1862c0ad892eded4cdf633ab32bc993cc1d9 (diff) | |
| download | linux-1698c6db420bc131d4b34bc39913ee817aa47312.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/mac80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index fa43c0d6abe2..b55181275fd0 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved. + * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved. * * Portions of this file are derived from the ipw3945 project, as well * as portions of the ieee80211 subsystem header files. |