]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 953575c 02a035c)
Merge branch 'master' of /repos/git/linux-2.6
authorPatrick McHardy <kaber@trash.net>
Mon, 8 Mar 2010 11:55:23 +0000 (12:55 +0100)
committerPatrick McHardy <kaber@trash.net>
Mon, 8 Mar 2010 11:55:23 +0000 (12:55 +0100)
commitdf8eed9004183e22f8ca92444b4fa5fc026d0159
tree171052d4734fda5e77668aacfff98de69e1f4237tree | snapshot
parent953575cefb0947e83ea08abed1458a846658b729commit | diff
parent02a035cc6c3aa03e6c23ccaadc17ddb1524e3424commit | diff
Merge branch 'master' of /repos/git/linux-2.6

Conflicts:
net/ipv4/netfilter/nf_nat_core.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_netlink.c

Signed-off-by: Patrick McHardy <kaber@trash.net>
Linux Kernel Source Tree.