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

projects / openwrt / staging / blogic.git / commit

author	David S. Miller <davem@davemloft.net>
	Mon, 14 Apr 2008 09:30:23 +0000 (02:30 -0700)
committer	David S. Miller <davem@davemloft.net>
	Mon, 14 Apr 2008 09:30:23 +0000 (02:30 -0700)
commit	df39e8ba56a788733d369068c7319e04b1da3cd5
tree	1e9be853bdb455e341cdbf957656f342cfa2eb9e	tree \| snapshot
parent	f5572855ec492334d8c3ec0e0e86c31865d5cf07	commit \| diff
parent	159d83363b629c91d020734207c1bc788b96af5a	commit \| diff

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

Conflicts:

drivers/net/ehea/ehea_main.c
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/rt2x00/rt61pci.c
net/ipv4/inet_timewait_sock.c
net/ipv6/raw.c
net/mac80211/ieee80211_sta.c

40 files changed:

drivers/net/ehea/ehea.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ehea/ehea_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/forcedeth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/assoc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt61pci.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/driver_mipscore.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/driver_pcicore.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/main.c	diff1 \|	diff2 \|	blob \| history
include/linux/Kbuild	diff1 \|	diff2 \|	blob \| history
include/linux/ipv6.h	diff1 \|	diff2 \|	blob \| history
include/net/sctp/command.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan_dev.c	diff1 \|	diff2 \|	blob \| history
net/atm/lec.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netfilter.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/dccp/dccp.h	diff1 \|	diff2 \|	blob \| history
net/dccp/ipv4.c	diff1 \|	diff2 \|	blob \| history
net/dccp/output.c	diff1 \|	diff2 \|	blob \| history
net/dccp/proto.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_sockglue.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ipt_CLUSTERIP.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/anycast.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/icmp.c	diff1 \|	diff2 \|	blob \| history
net/sctp/ipv6.c	diff1 \|	diff2 \|	blob \| history
net/sctp/outqueue.c	diff1 \|	diff2 \|	blob \| history
net/sctp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_make_chunk.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_sideeffect.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_statefuns.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

drivers/net/ehea/ehea.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ehea/ehea_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/forcedeth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/assoc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt61pci.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/driver_mipscore.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/driver_pcicore.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/main.c	diff1 \|	diff2 \|	blob \| history
include/linux/Kbuild	diff1 \|	diff2 \|	blob \| history
include/linux/ipv6.h	diff1 \|	diff2 \|	blob \| history
include/net/sctp/command.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan_dev.c	diff1 \|	diff2 \|	blob \| history
net/atm/lec.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netfilter.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/dccp/dccp.h	diff1 \|	diff2 \|	blob \| history
net/dccp/ipv4.c	diff1 \|	diff2 \|	blob \| history
net/dccp/output.c	diff1 \|	diff2 \|	blob \| history
net/dccp/proto.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_sockglue.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ipt_CLUSTERIP.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/anycast.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/icmp.c	diff1 \|	diff2 \|	blob \| history
net/sctp/ipv6.c	diff1 \|	diff2 \|	blob \| history
net/sctp/outqueue.c	diff1 \|	diff2 \|	blob \| history
net/sctp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_make_chunk.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_sideeffect.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_statefuns.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history