projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7d4c04f 3658f36)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 1 Apr 2013 17:36:50 +0000 (13:36 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Apr 2013 17:36:50 +0000 (13:36 -0400)
commita210576cf891e9e6d2c238eabcf5c1286b1e7526
tree0fa81a901cf628b25e6ee79057700cf39e59818atree | snapshot
parent7d4c04fc170087119727119074e72445f2bb192bcommit | diff
parent3658f3604066d5500ebd73a04084f127dc779441commit | diff
Merge git://git./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>
32 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/atheros/atl1e/atl1e_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/tg3.c diff1 | diff2 | blob | history
drivers/net/ethernet/davicom/dm9000.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/fec_main.c diff1 | | blob | history
drivers/net/ethernet/intel/e1000/e1000_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/e1000e/netdev.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ixgb/ixgb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/sh_eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/sh_eth.h diff1 | diff2 | blob | history
drivers/net/ethernet/ti/cpsw.c diff1 | diff2 | blob | history
drivers/net/ethernet/ti/davinci_emac.c diff1 | diff2 | blob | history
drivers/net/wireless/b43/dma.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/dvm/lib.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/dvm/ucode.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/pcie/trans.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/pcie/tx.c diff1 | diff2 | blob | history
drivers/net/wireless/mwifiex/pcie.c diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/flow.c diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
net/mac80211/iface.c diff1 | diff2 | blob | history
net/mac80211/mesh.c diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
net/mac80211/rx.c diff1 | diff2 | blob | history
net/mac80211/sta_info.c diff1 | diff2 | blob | history
net/wireless/core.c diff1 | diff2 | blob | history
net/wireless/core.h diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
net/wireless/sme.c diff1 | diff2 | blob | history
net/wireless/trace.h diff1 | diff2 | blob | history
John Crispins staging tree