From: David Miller <davem@davemloft.net> Date: 2007-07-06 21:12:48
I know that Patrick needs this in order to unload his netfilter
patches on me, so I took care of this today.
There was a minor, trivial to resolve, conflict in netpoll.c
but otherwise everything went in perfectly during the rebase.