]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c8e9e7c d6b8d13)
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)
commitc4ce3f437536766ec41e9177a6a73b85bee591e8
treea5bb4a9c51999557eaa919f27369c70811cd813ctree | snapshot
parentc8e9e7cf8d14c3e71c95c45a6afef646818b24dfcommit | diff
parentd6b8d13f27ab2a03c8ca63b4c2d15c4135781528commit | diff
Merge git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.