From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: net-2.6 merged into net-next-2.6
Date: Tue, 10 Jun 2008 12:24:57 -0700 (PDT)
Message-ID: <20080610.122457.103823964.davem@davemloft.net>
References: <20080610.025059.37807108.davem@davemloft.net>
	<20080610160212.GA16834@tuxdriver.com>
	<20080610174713.GA24763@tuxdriver.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: netdev@vger.kernel.org, jgarzik@pobox.com, sfr@canb.auug.org.au
To: linville@tuxdriver.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:40132
	"EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK)
	by vger.kernel.org with ESMTP id S1753246AbYFJTY5 (ORCPT
	<rfc822;netdev@vger.kernel.org>); Tue, 10 Jun 2008 15:24:57 -0400
In-Reply-To: <20080610174713.GA24763@tuxdriver.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: "John W. Linville" <linville@tuxdriver.com>
Date: Tue, 10 Jun 2008 13:47:13 -0400

> The following changes since commit 65b53e4cc90e59936733b3b95b9451d2ca47528d:
>   David S. Miller (1):
>         Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git master
> 
> John W. Linville (2):
>       rt2x00dev.c: fix-up merge damage
>       net/mac80211/ieee80211_i.h: fix-up merge damage

Pulled and pushed back out to net-next-2.6