git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	David S. Miller <davem@davemloft.net>
	Tue, 21 Jun 2011 05:29:08 +0000 (22:29 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 21 Jun 2011 05:29:08 +0000 (22:29 -0700)
commit	9f6ec8d697c08963d83880ccd35c13c5ace716ea
tree	ad8d93cf6fcdd09b86ade09f5fcbbc66cdb1cca2	tree \| snapshot
parent	4aa3a715551c93eda32d79bd52042ce500bd5383	commit \| diff
parent	56299378726d5f2ba8d3c8cbbd13cb280ba45e4f	commit \| diff

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
net/netfilter/ipvs/ip_vs_core.c

33 files changed:

drivers/net/3c503.c	diff1 \|	diff2 \|	blob \| history
drivers/net/arm/ep93xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.h	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp_async.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pxa168_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/farsync.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl-4965.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl-dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmfmac/wl_iw.c	diff1 \|	diff2 \|	blob \| history
include/linux/ethtool.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_diag.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/irda/iriap.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_conn.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_core.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

drivers/net/3c503.c	diff1 \|	diff2 \|	blob \| history
drivers/net/arm/ep93xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.h	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp_async.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pxa168_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/farsync.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl-4965.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl-dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmfmac/wl_iw.c	diff1 \|	diff2 \|	blob \| history
include/linux/ethtool.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_diag.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/irda/iriap.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_conn.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_core.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history