projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 761743e 0dcd505)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 31 Aug 2012 19:14:10 +0000 (15:14 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 31 Aug 2012 19:14:18 +0000 (15:14 -0400)
commitc32f38619af6302da58835fb292b159bdd96d11f
treea5bb4a9c51999557eaa919f27369c70811cd813ctree | snapshot
parent761743ebc92df72053e736fce953a5d2e90099d5commit | diff
parent0dcd5052c8543ef999bcd252cee50b7ae8111e89commit | diff
Merge git://git./linux/kernel/git/davem/net

Merge the 'net' tree to get the recent set of netfilter bug fixes in
order to assist with some merge hassles Pablo is going to have to deal
with for upcoming changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
20 files changed:
drivers/net/ethernet/emulex/benet/be_cmds.c diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/gianfar.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/ethtool.c diff1 | diff2 | blob | history
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/dvm/debugfs.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/pcie/internal.h diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/pcie/rx.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/pcie/trans.c diff1 | diff2 | blob | history
drivers/net/xen-netfront.c diff1 | diff2 | blob | history
fs/namei.c diff1 | diff2 | blob | history
net/core/netpoll.c diff1 | diff2 | blob | history
net/ipv4/ipmr.c diff1 | diff2 | blob | history
net/ipv4/route.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/mac80211/tx.c diff1 | diff2 | blob | history
net/netfilter/ipvs/ip_vs_ctl.c diff1 | diff2 | blob | history
net/netfilter/nfnetlink_log.c diff1 | diff2 | blob | history
net/netlink/af_netlink.c diff1 | diff2 | blob | history
net/packet/af_packet.c diff1 | diff2 | blob | history
John Crispins staging tree