[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-next
Subject:    linux-next: wireless merge conflict
From:       Stephen Rothwell <sfr () canb ! auug ! org ! au>
Date:       2008-05-29 5:19:18
Message-ID: 20080529151918.d2054d45.sfr () canb ! auug ! org ! au
[Download RAW message or body]

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/rt2x00/rt2x00dev.c between commit
2088d4174e4292aef892bb7095fc3c3ea5bd117c ("rt2x00: Don't count retries as
failure") from the wireless-current tree and commit
fb55f4d1fa252ba1e479284b79da1049d658c371 ("rt2x00: Fix TX status
reporting") from the wireless tree.

I fixed it up as you did in your merge-test-2 branch.

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

[Attachment #3 (application/pgp-signature)]
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[prev in list] [next in list] [prev in thread] [next in thread]