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: 76191e5 c9887c9)

author	Patrick McHardy <kaber@trash.net>
	Mon, 10 May 2010 16:39:28 +0000 (18:39 +0200)
committer	Patrick McHardy <kaber@trash.net>
	Mon, 10 May 2010 16:39:28 +0000 (18:39 +0200)
commit	9aa7477923608b8d092832aee8e61de46c995130
tree	b016cf2c728289c7e36d9e4e488f30ab0bd0ae6e	tree \| snapshot
parent	76191e53fab568cb220beb4995bdc407c956176e	commit \| diff
parent	c9887c9bf5ca37d9e3f88ab040839b2374e295e4	commit \| diff

Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
net/bridge/br_device.c
net/bridge/br_forward.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

include/linux/ipv6.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_device.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_forward.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_multicast.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipmr.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/mcast.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.