5532a8dad265b51339c2
parent d6e8cc6cc7ac77b0f9118f78c453a2e834e62709
author David S. Miller <davem@davemloft.net> 1227867555 -0800
committer David S. Miller <davem@davemloft.net> 1227867555 -0800

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

Conflicts:

	net/netfilter/nf_conntrack_netlink.c
'��/�0x