Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
David S. Miller [Fri, 11 Sep 2009 01:17:09 +0000 (18:17 -0700)]
1  2 
Documentation/feature-removal-schedule.txt
include/net/rtnetlink.h

Simple merge