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: 5cd78b7 adc9300)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 18 Nov 2011 01:30:27 +0000 (12:30 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 18 Nov 2011 01:30:27 +0000 (12:30 +1100)
commit	fc83dd862229121913b94548bc557b4eed983546
tree	c3da726864fe95a1bac420de0492bdc4421c4012	tree \| snapshot
parent	5cd78b78c5828922d0b8ba0a419d10c4d3676f46	commit \| diff
parent	adc9300e78e6091a7eaa1821213836379d4dbaa8	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