net-next-2.6 merged...
From: David Miller <davem@davemloft.net>
Date: 2011-05-20 22:03:16
Also in:
linux-wireless, netfilter-devel
Linus pulled in all the changes from net-next-2.6 John Linville has some wireless stuff to submit to me from his tree, things which have been there since before the merge window openned up, but otherwise that is it.