OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
761743e
0dcd505
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Fri, 31 Aug 2012 19:14:10 +0000
(15:14 -0400)
committer
David S. Miller
<davem@davemloft.net>
Fri, 31 Aug 2012 19:14:18 +0000
(15:14 -0400)
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:
1
2
drivers/net/ethernet/emulex/benet/be_cmds.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/emulex/benet/be_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/freescale/gianfar.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/sfc/ethtool.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/dvm/debugfs.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/pcie/internal.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/pcie/rx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/pcie/trans.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/xen-netfront.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/namei.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/netpoll.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/ipmr.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/route.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/tcp_input.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/tx.c
patch
|
diff1
|
diff2
|
blob
|
history
net/netfilter/ipvs/ip_vs_ctl.c
patch
|
diff1
|
diff2
|
blob
|
history
net/netfilter/nfnetlink_log.c
patch
|
diff1
|
diff2
|
blob
|
history
net/netlink/af_netlink.c
patch
|
diff1
|
diff2
|
blob
|
history
net/packet/af_packet.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/ethernet/emulex/benet/be_cmds.c
Simple merge
diff --cc
drivers/net/ethernet/emulex/benet/be_main.c
Simple merge
diff --cc
drivers/net/ethernet/freescale/gianfar.c
Simple merge
diff --cc
drivers/net/ethernet/sfc/ethtool.c
Simple merge
diff --cc
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/dvm/debugfs.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/pcie/internal.h
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/pcie/rx.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge
diff --cc
drivers/net/xen-netfront.c
Simple merge
diff --cc
fs/namei.c
Simple merge
diff --cc
net/core/netpoll.c
Simple merge
diff --cc
net/ipv4/ipmr.c
Simple merge
diff --cc
net/ipv4/route.c
Simple merge
diff --cc
net/ipv4/tcp_input.c
Simple merge
diff --cc
net/mac80211/tx.c
Simple merge
diff --cc
net/netfilter/ipvs/ip_vs_ctl.c
Simple merge
diff --cc
net/netfilter/nfnetlink_log.c
Simple merge
diff --cc
net/netlink/af_netlink.c
Simple merge
diff --cc
net/packet/af_packet.c
Simple merge