]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 37a664b 377a28b)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 28 Sep 2012 18:40:49 +0000 (14:40 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Sep 2012 18:40:49 +0000 (14:40 -0400)
commit4e2c500ffd43a111eb05b6c906f2191db12e47a2
tree8faea23112a11f52524eb413f71b7b02712d8b53tree | snapshot
parent37a664b839ba96b09a50c949eed7115094b511accommit | diff
parent377a28b1a3f11cb5f0ca2f4f00c76f528ffc383ccommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/team/team.c
drivers/net/usb/qmi_wwan.c
net/batman-adv/bat_iv_ogm.c
net/ipv4/fib_frontend.c
net/ipv4/route.c
net/l2tp/l2tp_netlink.c

The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.

qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.

With help from Antonio Quartulli.

Signed-off-by: David S. Miller <davem@davemloft.net>
49 files changed:
drivers/infiniband/ulp/ipoib/ipoib.h diff1 | diff2 | blob | history
drivers/infiniband/ulp/ipoib/ipoib_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/gianfar_ptp.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/e1000/e1000_main.c diff1 | diff2 | blob | history
drivers/net/team/team.c diff1 | diff2 | blob | history
drivers/net/usb/asix_devices.c diff1 | diff2 | blob | history
drivers/net/usb/qmi_wwan.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/debug.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/hw.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/hw.h diff1 | diff2 | blob | history
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c diff1 | diff2 | blob | history
drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c diff1 | diff2 | blob | history
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/pcie/trans.c diff1 | diff2 | blob | history
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c diff1 | diff2 | blob | history
drivers/net/wireless/rtlwifi/rtl8192ce/sw.c diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
include/net/ip6_fib.h diff1 | diff2 | blob | history
include/net/net_namespace.h diff1 | diff2 | blob | history
include/net/netns/ipv4.h diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
kernel/pid_namespace.c diff1 | diff2 | blob | history
net/batman-adv/bat_iv_ogm.c diff1 | diff2 | blob | history
net/batman-adv/soft-interface.c diff1 | diff2 | blob | history
net/bluetooth/bnep/sock.c diff1 | diff2 | blob | history
net/bluetooth/cmtp/sock.c diff1 | diff2 | blob | history
net/bluetooth/hci_core.c diff1 | diff2 | blob | history
net/bluetooth/hci_sock.c diff1 | diff2 | blob | history
net/bluetooth/hidp/sock.c diff1 | diff2 | blob | history
net/bluetooth/l2cap_core.c diff1 | diff2 | blob | history
net/bluetooth/mgmt.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/core/sock.c diff1 | diff2 | blob | history
net/ipv4/devinet.c diff1 | diff2 | blob | history
net/ipv4/raw.c diff1 | diff2 | blob | history
net/ipv4/route.c diff1 | diff2 | blob | history
net/ipv4/tcp.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv6/raw.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/l2tp/l2tp_netlink.c diff1 | diff2 | blob | history
net/sched/sch_qfq.c diff1 | diff2 | blob | history
net/wireless/reg.c diff1 | diff2 | blob | history
net/xfrm/xfrm_policy.c diff1 | diff2 | blob | history
net/xfrm/xfrm_user.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.