]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 127ce1b c6f8f21)
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)
commit07c4543000627156c2a517a5fc51a13bc2b8a62e
tree2ae9e42612f35be897f190983fc292d7af781cd2tree | snapshot
parent127ce1bf9cd23e14bdf7a1b7607ac49a576c706bcommit | diff
parentc6f8f21926da8e9b5cb85862ae2427b6df2ea190commit | diff
Merge git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.