Return-path: Received: from shards.monkeyblade.net ([149.20.54.216]:38985 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752748Ab2F2XaB (ORCPT ); Fri, 29 Jun 2012 19:30:01 -0400 Date: Fri, 29 Jun 2012 16:30:00 -0700 (PDT) Message-Id: <20120629.163000.1896082322067833849.davem@davemloft.net> (sfid-20120630_013013_261726_557A3797) To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: Re: pull request: wireless-next 2012-06-29 From: David Miller In-Reply-To: <20120629172836.GB30528@tuxdriver.com> References: <20120629172836.GB30528@tuxdriver.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Sender: linux-wireless-owner@vger.kernel.org List-ID: From: "John W. Linville" Date: Fri, 29 Jun 2012 13:28:37 -0400 > Here is another batch of updates intended for 3.6. This includes a > number of pulls, including ones from the mac80211, iwlwifi, ath6kl, and > wl12xx trees. I also pulled from the wireless tree to avoid potential > build conflicts. There are a number of other patches applied directly, > including a number for the Broadcom drivers and the mwifiex driver. > > The updates cover the usual variety of new hardware support and feature > enhancements. It's all good work, but there aren't any big headliners. > This does resolve a net-next/wireless-next merge conflict reported > by Stephen. Pulled, thanks John.