]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7d0a82a a894292)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 9 Oct 2013 03:07:53 +0000 (23:07 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Oct 2013 03:07:53 +0000 (23:07 -0400)
commit1c7e7d1f7ed86eac7f9a685193521ed201d12bdb
tree0cd5309f2a931d3f210aa3d2025aae64f2276e8ctree | snapshot
parent7d0a82a63039fb7f247a62aa646eefa84e5f43f7commit | diff
parenta894292887caf525be279ab14e9f0291dc24718ccommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
include/linux/netdevice.h
net/core/sock.c

Trivial merge issues.

Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.

Two parallel line additions in net/core/sock.c

Signed-off-by: David S. Miller <davem@davemloft.net>
14 files changed:
drivers/net/ethernet/intel/igb/igb_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/mv643xx_eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/sh_eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/ef10.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/nic.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/nic.h diff1 | diff2 | blob | history
drivers/net/ethernet/ti/cpsw.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/xmit.c diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/sock.c diff1 | diff2 | blob | history
net/ipv4/inet_hashtables.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.