[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20090224.235317.10940015.davem@davemloft.net>
Date: Tue, 24 Feb 2009 23:53:17 -0800 (PST)
From: David Miller <davem@...emloft.net>
To: linville@...driver.com
Cc: linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: pull request: wireless-2.6 2009-02-23
From: "John W. Linville" <linville@...driver.com>
Date: Mon, 23 Feb 2009 14:26:17 -0500
> Here are a couple of fixes, one for an oops and one for a warning. Also
> included is a PCI ID addition. These are intended for 2.6.29.
Pulled, thanks John.
> P.S. This causes some conflicts with -next. The ath9k conflict is
> simple. The orinoco conflict involves moving some code from orinoco.c
> to orinoco/main.c in -next (where orinoco.c no longer exists). I have
> included a "merge-test" branch in the wireless-next-2.6 tree to provide
> and example for the merge when you get to it.
Ok, I'll take care of that now, thanks John.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists