Re: pull request: wireless-2.6 2009-03-16

[Stephen Rothwell]

Hi John,

On Mon, 16 Mar 2009 19:14:24 -0400 "John W. Linville" <linville@xxxxxxxxxxxxx> wrote:
>
> The first one from Luis fixes bug 12110 at bugzilla.kernel.org.  I know
> he has worked on it for a long time and I've had several desperate users
> asking for it, so it must be good. :-)  Unfortunately, it causes some
> nasty merge errors with what is in net-next-2.6 and wireless-next-2.6.
> I created a merge-test branch in wireless-next-2.6, and the merge commit
> log goes into more detail about resolving the issue.  In short, you
> probably want to diff drivers/net/ath9k against the merge-test branch...

I resolved the conflicts as you suggested (hopefully).

Thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature