]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 02:08:12 +0000 (12:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 02:08:12 +0000 (12:08 +1000)
commite1395816f953965b6cda7271a186794b4fbae80e
tree168009b1b445cc1abcee761fa6de32c18cf78caf
parentcf14a6beeb5c4b87492f65efc2542e81f4640efb
parentdab531b4305bc2852ce6f934dc283464d46871a5
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/altera/altera_msgdma.c
drivers/net/ethernet/altera/altera_sgdma.c
net/ipv6/xfrm6_output.c
25 files changed:
MAINTAINERS
arch/arm/boot/dts/am33xx.dtsi
arch/x86/net/bpf_jit_comp.c
drivers/net/ethernet/altera/altera_sgdma.c
drivers/net/ethernet/altera/altera_tse_ethtool.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/macvlan.c
drivers/net/wireless/iwlwifi/mvm/coex.c
drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/mvm.h
drivers/net/wireless/iwlwifi/mvm/rs.c
drivers/net/wireless/iwlwifi/mvm/scan.c
drivers/net/wireless/iwlwifi/mvm/utils.c
drivers/net/wireless/iwlwifi/pcie/trans.c
include/uapi/linux/audit.h
include/uapi/linux/nl80211.h
lib/Kconfig.debug
net/core/dev.c
net/core/net_namespace.c
net/ipv4/xfrm4_output.c
net/ipv6/ip6_output.c
net/ipv6/xfrm6_output.c
net/mac80211/ieee80211_i.h
net/mac80211/mlme.c