Hi John, On Wed, 25 Jun 2008 14:04:30 -0400 "John W. Linville" <linville@xxxxxxxxxxxxx> wrote: > > I just sent a pull request for Dave that will result in nasty-looking > conflict in iwl4965-base.c. I have a sample merge available here: > > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test > > The overview of the resolution is to ignore any changes in > iwl4965-base.c and take drivers/net/wireless/iwlwifi/iwl-scan.c from > the URL above. > > Just a heads-up... :-) Thanks, I will check it out. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpUnwXr8jcNO.pgp
Description: PGP signature
