Hi John, On Tue, 17 Feb 2009 22:02:46 -0500 "John W. Linville" <linville@xxxxxxxxxxxxx> wrote: > > There are several conflicts in the latest rounds of the wireless trees. > Most of them are simple. One of them involves transporting some > changes from "orinoco: do not resgister NULL pm_notifier function" > between drivers/net/orinoco/orinoco.c (which no longer exists in -next) > over to drivers/net/orinoco/main.c. > > I have an example 'merge-test' branch in wireless-next-2.6 to show > how I think the conflicts should be resolved -- enjoy! :-) Thanks for the heads up and your merge-test branch. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpGsmtmR0UKO.pgp
Description: PGP signature
