projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b97526f a6c5170)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 4 Mar 2015 02:16:48 +0000 (21:16 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Mar 2015 02:16:48 +0000 (21:16 -0500)
commit71a83a6db6138b9d41d8a0b6b91cb59f6dc4742c
treef74b6e4e48257ec6ce40b95645ecb8533b9cc1f8tree | snapshot
parentb97526f3ff95f92b107f0fb52cbb8627e395429bcommit | diff
parenta6c5170d1edea97c538c81e377e56c7b5c5b7e63commit | diff
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

Signed-off-by: David S. Miller <davem@davemloft.net>
35 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/bluetooth/btusb.c diff1 | diff2 | blob | history
drivers/net/dsa/bcm_sf2.h diff1 | diff2 | blob | history
drivers/net/ethernet/altera/altera_tse_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/genet/bcmgenet.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/genet/bcmgenet.h diff1 | diff2 | blob | history
drivers/net/ethernet/cisco/enic/enic_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_common.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_debugfs.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_nvm.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_txrx.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_txrx.h diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40evf/i40e_txrx.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40evf/i40e_txrx.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/en_selftest.c diff1 | diff2 | blob | history
drivers/net/ethernet/rocker/rocker.c diff1 | diff2 | blob | history
drivers/net/ethernet/xscale/ixp4xx_eth.c diff1 | diff2 | blob | history
drivers/net/macvtap.c diff1 | diff2 | blob | history
drivers/net/team/team.c diff1 | diff2 | blob | history
drivers/net/usb/hso.c diff1 | diff2 | blob | history
drivers/net/wireless/mac80211_hwsim.c diff1 | diff2 | blob | history
drivers/vhost/net.c diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
net/compat.c diff1 | diff2 | blob | history
net/core/ethtool.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/netfilter/ipvs/ip_vs_ctl.c diff1 | diff2 | blob | history
net/netfilter/nft_compat.c diff1 | diff2 | blob | history
net/netlink/af_netlink.c diff1 | diff2 | blob | history
net/packet/af_packet.c diff1 | diff2 | blob | history
net/tipc/socket.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
John Crispins staging tree