]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 18 Nov 2012 03:00:43 +0000 (22:00 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 18 Nov 2012 03:00:43 +0000 (22:00 -0500)
commit67f4efdce7d85282fbd5832cddc80a07eb89b6d6
tree9a1771ef13b27abdf8cf172e5b7556ab93e5c48c
parentc53aa5058ad5ca8876a47d6639ad4d4f2c5ed584
parentf4a75d2eb7b1e2206094b901be09adb31ba63681
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Minor line offset auto-merges.

Signed-off-by: David S. Miller <davem@davemloft.net>
26 files changed:
MAINTAINERS
drivers/net/ethernet/micrel/ksz884x.c
drivers/net/usb/cdc_ncm.c
drivers/net/usb/smsc95xx.c
drivers/net/vxlan.c
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/iwlwifi/dvm/main.c
drivers/net/wireless/iwlwifi/pcie/rx.c
net/batman-adv/soft-interface.c
net/batman-adv/translation-table.c
net/bluetooth/hci_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c
net/core/dev.c
net/ipv4/ip_vti.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv6/ipv6_sockglue.c
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/main.c
net/mac80211/scan.c
net/mac80211/sta_info.c
net/mac80211/status.c
net/mac80211/tx.c
net/mac80211/util.c