Messages in this thread | | | Date | Tue, 24 Nov 2009 10:05:25 -0500 | From | "John W. Linville" <> | Subject | Re: linux-next: manual merge of the wireless tree with the wireless-current tree |
| |
On Tue, Nov 24, 2009 at 02:11:41PM +1100, Stephen Rothwell wrote: > Hi John, > > Today's linux-next merge of the wireless tree got a conflict in > drivers/net/wireless/ath/ath9k/main.c between commit > 54ab040d24904d1fa2c0a6a27936b7c56a4efb24 ("ath9k: set ps_default as > false") from the wireless-current tree and commit > 18b6c9a2213d3b6e0212e8b225abf95f7564206a ("ath9k: set ps_default as > false") from the wireless tree. > > The commit message of the latter made me use just its version.
Yes, that's the correct fix. :-)
-- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready.
| |