From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: net-next-2.6 merged...
Date: Fri, 20 May 2011 18:03:16 -0400 (EDT)
Message-ID: <20110520.180316.1370419098399779268.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: linux-wireless@vger.kernel.org, netfilter-devel@vger.kernel.org
To: netdev@vger.kernel.org
Return-path: <netfilter-devel-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([198.137.202.13]:37717 "EHLO
	shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755403Ab1ETWDV (ORCPT
	<rfc822;netfilter-devel@vger.kernel.org>);
	Fri, 20 May 2011 18:03:21 -0400
Sender: netfilter-devel-owner@vger.kernel.org
List-ID: <netfilter-devel.vger.kernel.org>


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.