git.stricted.de - GitHub/LineageOS/android_kernel_samsung_universal7580.git/commit

projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3b254c5 3ee9437)

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	1e4b1057121bc756b91758a434b504d2010f6088
tree	b016cf2c728289c7e36d9e4e488f30ab0bd0ae6e	tree \| snapshot (tar.gz zip)
parent	3b254c54ec46eb022cb26ee6ab37fae23f5f7d6a	commit \| diff
parent	3ee943728fff536edaf8f59faa58aaa1aa7366e3	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