]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 00:40:47 +0000 (11:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 00:43:09 +0000 (11:43 +1100)
commitce5dd8caa41736667f5a713b90f6f7f8a9ad1f09
tree47d52962df7307daaf435acf93cf35cf2b959f06
parentf2fa4ed34b4242583c5e720d86f75ac36f28e226
parentd66248326410ed0d3e813ebe974b3e6638df0717
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c
drivers/nfc/microread/mei.c
22 files changed:
MAINTAINERS
drivers/net/ethernet/sfc/falcon.c
drivers/net/wireless/ath/wil6210/debugfs.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/ray_cs.c
drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/rt2800pci.c
drivers/net/wireless/rt2x00/rt2x00mmio.c
net/bluetooth/af_bluetooth.c
net/core/neighbour.c
net/ipv4/tcp_ipv4.c
net/ipv4/udp.c
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/iface.c
net/mac80211/offchannel.c
net/nfc/llcp/llcp.c
net/nfc/llcp/sock.c
net/wireless/sme.c