git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3153341 be93a57)

author	David S. Miller <davem@davemloft.net>
	Tue, 15 Jul 2008 03:23:54 +0000 (20:23 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 15 Jul 2008 03:23:54 +0000 (20:23 -0700)
commit	6130d5419624aec914c960083b06d1f53d3fb9a0
tree	eb3e8a79604113392d0ee74b19dbc1dfce579c11	tree \| snapshot
parent	31533419cf5f3c45463b8e8d25ed135404694da2	commit \| diff
parent	be93a57e6f73b3a32ed3c83e38f91f978745ea75	commit \| diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

net/netfilter/nf_conntrack_proto_tcp.c

14 files changed:

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2400pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2500pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2500usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt61pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt73usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/zd1211rw/zd_mac.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_trie.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/exthdrs.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rc80211_pid.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/rc80211_pid_algo.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_proto_tcp.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.