diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-01 17:36:50 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-01 17:36:50 (GMT) |
| commit | a210576cf891e9e6d2c238eabcf5c1286b1e7526 (patch) | |
| tree | 0fa81a901cf628b25e6ee79057700cf39e59818a /drivers/net/ethernet/stmicro/stmmac/descs_com.h | |
| parent | 7d4c04fc170087119727119074e72445f2bb192b (diff) | |
| parent | 3658f3604066d5500ebd73a04084f127dc779441 (diff) | |
| download | linux-fsl-qoriq-a210576cf891e9e6d2c238eabcf5c1286b1e7526.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/mac80211/sta_info.c
net/wireless/core.h
Two minor conflicts in wireless. Overlapping additions of extern
declarations in net/wireless/core.h and a bug fix overlapping with
the addition of a boolean parameter to __ieee80211_key_free().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/descs_com.h')
0 files changed, 0 insertions, 0 deletions