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

projects / openwrt / staging / blogic.git / commit

author	David S. Miller <davem@davemloft.net>
	Wed, 8 Dec 2010 21:15:38 +0000 (13:15 -0800)
committer	David S. Miller <davem@davemloft.net>
	Wed, 8 Dec 2010 21:47:38 +0000 (13:47 -0800)
commit	fe6c791570efe717946ea7b7dd50aec96b70d551
tree	1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434	tree \| snapshot
parent	f8bf5681cf15f77692c8ad8cb95d059ff7c622c9	commit \| diff
parent	f19872575ff7819a3723154657a497d9bca66b33	commit \| diff

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

Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/llc/af_llc.c

46 files changed:

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_cmds.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb4vf/cxgb4vf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb4vf/t4vf_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000/e1000_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ehea/ehea_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pch_gbe/pch_gbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp_generic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/efx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/net_driver.h	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/nic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/hso.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_eeprom.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/eeprom.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/eeprom_def.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/reg.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/main.c	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/ceph/Makefile	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/request_sock.c	diff1 \|	diff2 \|	blob \| history
net/dccp/input.c	diff1 \|	diff2 \|	blob \| history
net/decnet/af_decnet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_minisocks.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/sit.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ip.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/x25/x25_link.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_cmds.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb4vf/cxgb4vf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb4vf/t4vf_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000/e1000_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ehea/ehea_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pch_gbe/pch_gbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp_generic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/efx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/net_driver.h	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/nic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/hso.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_eeprom.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/eeprom.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/eeprom_def.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/reg.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/main.c	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/ceph/Makefile	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/request_sock.c	diff1 \|	diff2 \|	blob \| history
net/dccp/input.c	diff1 \|	diff2 \|	blob \| history
net/decnet/af_decnet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_minisocks.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/sit.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ip.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/x25/x25_link.c	diff1 \|	diff2 \|	blob \| history