]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1763d73 4dd7225)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 7 Apr 2013 22:37:01 +0000 (18:37 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 7 Apr 2013 22:37:01 +0000 (18:37 -0400)
commit6557a081ce751f6e469583bbe1bbfdf48c0d8179
tree8e8a8c62286fab2c044c4b53563222c1b66d7cb0tree | snapshot
parent1763d7363267086f40d5d85d06a1dfd89704aae5commit | diff
parent4dd7225acb50ab36fef1f048bfdfd71e55981036commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/nfc/microread/mei.c
net/netfilter/nfnetlink_queue_core.c

Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.

Signed-off-by: David S. Miller <davem@davemloft.net>
26 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/bonding/bond_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/atheros/atl1e/atl1e_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/realtek/r8169.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/dvm/tx.c diff1 | diff2 | blob | history
drivers/net/wireless/mwifiex/cfg80211.c diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
include/linux/skbuff.h diff1 | diff2 | blob | history
net/bluetooth/af_bluetooth.c diff1 | diff2 | blob | history
net/caif/caif_socket.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/ipv4/devinet.c diff1 | diff2 | blob | history
net/ipv6/netfilter/ip6t_NPT.c diff1 | diff2 | blob | history
net/ipv6/tcp_ipv6.c diff1 | diff2 | blob | history
net/iucv/af_iucv.c diff1 | diff2 | blob | history
net/mac80211/cfg.c diff1 | diff2 | blob | history
net/mac80211/ieee80211_i.h diff1 | diff2 | blob | history
net/mac80211/iface.c diff1 | diff2 | blob | history
net/mac80211/offchannel.c diff1 | diff2 | blob | history
net/netfilter/nf_conntrack_standalone.c diff1 | diff2 | blob | history
net/nfc/llcp/llcp.c diff1 | diff2 | blob | history
net/nfc/llcp/sock.c diff1 | diff2 | blob | history
net/unix/af_unix.c diff1 | diff2 | blob | history
net/vmw_vsock/vmci_transport.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.