]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:35:23 +0000 (14:35 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:35:23 +0000 (14:35 +0200)
commitd09f4bdc4b8feadbb3326d4e6e0890556b19bf07
treee1b85931bafb22b9c883393cb6bb15052611c409
parentf576607a662c24ffd99474e2afff503440c9a41d
parentb45bd46decd947eaa3497699d450e0851d247534
Merge remote-tracking branch 'net-next/master'

Conflicts:
arch/h8300/include/uapi/asm/socket.h
arch/parisc/include/uapi/asm/socket.h
16 files changed:
MAINTAINERS
arch/parisc/include/uapi/asm/socket.h
drivers/net/ethernet/amd/declance.c
drivers/net/ethernet/broadcom/b44.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/brocade/bna/bnad.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/rt2x00/rt2x00mac.c
net/ipv4/tcp.c
net/mac80211/ieee80211_i.h
net/mac80211/mlme.c
net/sctp/ipv6.c