Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 15 Mar 2011 20:03:27 +0000 (13:03 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Mar 2011 20:03:27 +0000 (13:03 -0700)
commit31111c26d976ca0f298312f08e44cdb078005b03
treeca08ef55b2ea91f9e69f8a78bb8b4363a1759b54
parent0c0217b016ba8a970a6f6ab62ad0d858f39881ca
parent2f5dc63123905a89d4260ab8ee08d19ec104db04
Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-next-2.6

Conflicts:
Documentation/feature-removal-schedule.txt
Documentation/feature-removal-schedule.txt
net/netfilter/ipvs/ip_vs_ctl.c
net/netfilter/nf_conntrack_core.c