projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ab48dd 25cf84c)
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)
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>

Trivial merge