lkml.org 
[lkml]   [2009]   [Feb]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: pull request: wireless-2.6 2009-02-23
From
From: "John W. Linville" <linville@tuxdriver.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.


\
 
 \ /
  Last update: 2009-02-25 08:57    [W:0.090 / U:0.228 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site