From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: net-2.6 merged into net-next-2.6
Date: Thu, 19 Jun 2008 16:06:59 -0700 (PDT)
Message-ID: <20080619.160659.181429565.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: sfr@canb.auug.org.au
To: netdev@vger.kernel.org
Return-path: <netdev-owner@vger.kernel.org>
Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:45306
	"EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK)
	by vger.kernel.org with ESMTP id S1752970AbYFSXG7 (ORCPT
	<rfc822;netdev@vger.kernel.org>); Thu, 19 Jun 2008 19:06:59 -0400
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>


I've done this merge to address the merge conflict created
by the skb_header_cloned() revert made to net/mac80211/tx.c

It is possible I screwed this up, so wireless folks should
take a look and send me any fixups.

Thanks.