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

author David S. Miller <davem@davemloft.net>

Fri, 11 Sep 2009 01:17:09 +0000 (18:17 -0700)

committer David S. Miller <davem@davemloft.net>

Fri, 11 Sep 2009 01:17:09 +0000 (18:17 -0700)
author David S. Miller <davem@davemloft.net>
Fri, 11 Sep 2009 01:17:09 +0000 (18:17 -0700)
committer David S. Miller <davem@davemloft.net>
Fri, 11 Sep 2009 01:17:09 +0000 (18:17 -0700)
diff --cc Documentation/feature-removal-schedule.txt
Simple merge
diff --cc include/net/rtnetlink.h
Simple merge
author	David S. Miller <davem@davemloft.net>
	Fri, 11 Sep 2009 01:17:09 +0000 (18:17 -0700)
committer	David S. Miller <davem@davemloft.net>
	Fri, 11 Sep 2009 01:17:09 +0000 (18:17 -0700)
		1	2
Documentation/feature-removal-schedule.txt	patch \|	diff1 \|	diff2 \|	blob \| history
include/net/rtnetlink.h	patch \|	diff1 \|	diff2 \|	blob \| history