lkml.org 
[lkml]   [2010]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the wireless tree with the wireless-current tree
On Thu, Apr 01, 2010 at 12:59:44PM +1100, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-4965.c between commit
> be6b38bcb175613f239e0b302607db346472c6b6 ("iwlwifi: counting number of
> tfds can be free for 4965") from the wireless-current tree and commit
> 74bcdb33e99f49ef5202dd2f8109945b4570edc2 ("iwlwifi: move agn only tx
> functions from iwlcore to iwlagn") from the wireless tree.
>
> I fixed it up (see below) and can carry the fix for a while.

Yes, that looks correct to me.

Thanks!

John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.


\
 
 \ /
  Last update: 2010-04-01 13:47    [W:0.039 / U:0.544 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site