git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 01a01f9 f8a15af)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 21 Nov 2011 00:12:05 +0000 (11:12 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 21 Nov 2011 00:12:05 +0000 (11:12 +1100)
commit	f72ec3747aa3ce6babe39c5b43600f18c5d97bbc
tree	23e655bb49287f06e3421544b21ac5a7f91e6dfa	tree \| snapshot
parent	01a01f9db7dd061e6ec6ae587deb773d2864e3a0	commit \| diff
parent	f8a15af093b19b86d56933c8757cee298d0f32a8	commit \| diff

Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/wireless/libertas/cfg.c

16 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/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

Linux kernel for KaRo TX COM modules