git.maquefel.me Git - linux.git/commit

author	David S. Miller <davem@davemloft.net>
	Wed, 13 Jun 2012 04:59:18 +0000 (21:59 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 13 Jun 2012 04:59:18 +0000 (21:59 -0700)
commit	43b03f1f6d6832d744918947d185a7aee89d1e0f
tree	53a8c47d67dfcd23450d4068d08ccf2b7714c5e8	tree \| snapshot
parent	2da45db2bdd432a9dca825099c791f5c851f92b9	commit \| diff
parent	5ee31c6898ea5537fcea160999d60dc63bc0c305	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Conflicts:
MAINTAINERS
drivers/net/wireless/iwlwifi/pcie/trans.c

The iwlwifi conflict was resolved by keeping the code added
in 'net' that turns off the buggy chip feature.

The MAINTAINERS conflict was merely overlapping changes, one
change updated all the wireless web site URLs and the other
changed some GIT trees to be Johannes's instead of John's.

Signed-off-by: David S. Miller <davem@davemloft.net>

16 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/mdio_bus.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/sta.c	diff1 \|	\|	blob \| history
drivers/net/wireless/iwlwifi/iwl-prph.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/6000.c	diff1 \|	\|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	diff1 \|	\|	blob \| history
include/linux/tcp.h	diff1 \|	diff2 \|	blob \| history
include/net/route.h	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_fib.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/nfc/llcp/sock.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/mdio_bus.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/sta.c	diff1 \|	\|	blob \| history
drivers/net/wireless/iwlwifi/iwl-prph.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/6000.c	diff1 \|	\|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	diff1 \|	\|	blob \| history
include/linux/tcp.h	diff1 \|	diff2 \|	blob \| history
include/net/route.h	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_fib.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/nfc/llcp/sock.c	diff1 \|	diff2 \|	blob \| history