diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-03 20:28:35 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-03 20:28:35 +0100 |
commit | a45d49d1053fd5954260a70e555daabd5672577d (patch) | |
tree | 042d1421b20d6437884c4f0311e5a69caf6d959c /net/mac80211/sta_info.h | |
parent | ipv4: Fix __ip_dev_find() to use ifa_local instead of ifa_address. (diff) | |
parent | ixgbe: cleanup copyright string for 2011 (diff) | |
download | linux-a45d49d1053fd5954260a70e555daabd5672577d.tar.xz linux-a45d49d1053fd5954260a70e555daabd5672577d.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'net/mac80211/sta_info.h')
0 files changed, 0 insertions, 0 deletions