projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f8a15af 6fe4c6d)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 21 Nov 2011 18:50:33 +0000 (13:50 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 21 Nov 2011 18:50:33 +0000 (13:50 -0500)
commitefd0bf97deeddd9ba53daabfc470a1399c6b0b2d
treeeec56da5fbc796bac7c67f1990a18f5e0a304059tree | snapshot
parentf8a15af093b19b86d56933c8757cee298d0f32a8commit | diff
parent6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82commit | diff
Merge git://git./linux/kernel/git/davem/net

The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/wireless/libertas/cfg.c
17 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/Kconfig diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/sky2.c diff1 | diff2 | blob | history
drivers/net/ethernet/nvidia/forcedeth.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/xilinx/ll_temac_main.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c diff1 | diff2 | blob | history
drivers/net/wireless/libertas/cfg.c diff1 | diff2 | blob | history
drivers/net/wireless/mwifiex/scan.c diff1 | diff2 | blob | history
drivers/s390/net/qeth_l3_main.c diff1 | diff2 | blob | history
drivers/virtio/virtio_pci.c diff1 | diff2 | blob | history
net/ipv6/ip6_tunnel.c diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
net/mac80211/rx.c diff1 | diff2 | blob | history
net/mac80211/util.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.