projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d649a7a b23dc5a)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 14 Nov 2014 06:01:12 +0000 (01:01 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Nov 2014 06:01:12 +0000 (01:01 -0500)
commit076ce4482569ea1a2c27b4ca71a309adaf91d398
tree2ae9e42612f35be897f190983fc292d7af781cd2tree | snapshot (tar.gz zip)
parentd649a7a81f3b5bacb1d60abd7529894d8234a666commit | diff
parentb23dc5a7cc6ebc9a0d57351da7a0e8454c9ffea3commit | diff
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/chelsio/cxgb4vf/sge.c
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

sge.c was overlapping two changes, one to use the new
__dev_alloc_page() in net-next, and one to use s->fl_pg_order in net.

ixgbe_phy.c was a set of overlapping whitespace changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
25 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/sge.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/t4_regs.h diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4vf/sge.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c diff1 | diff2 | blob | history
drivers/net/vxlan.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/mac80211.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/mvm.h diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/ops.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/pcie/trans.c diff1 | diff2 | blob | history
drivers/net/wireless/mac80211_hwsim.c diff1 | diff2 | blob | history
drivers/usb/gadget/function/f_phonet.c diff1 | diff2 | blob | history
lib/rhashtable.c diff1 | diff2 | blob | history
net/ipv4/fou.c diff1 | diff2 | blob | history
net/ipv4/ip_sockglue.c diff1 | diff2 | blob | history
net/irda/af_irda.c diff1 | diff2 | blob | history
net/mac80211/ieee80211_i.h diff1 | diff2 | blob | history
net/mac80211/iface.c diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
net/mac80211/rx.c diff1 | diff2 | blob | history
net/netlink/af_netlink.c diff1 | diff2 | blob | history