On Fri, 2007-03-23 at 01:55 -0400, Jeff Garzik wrote: > John W. Linville wrote: > > The following changes since commit 0e39a919461842a38e406702fe0e94c6138ddfef > > John W. Linville (1): > > Merge branch 'upstream-fixes' into upstream > > > > are found in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream > > pulled this and upstream-fixes. libertas had a merge conflict that I > would prefer you sort out. > > You should merge libertas branch into upstream anyway Could you elaborate a bit? We definitely need to get that fixed. Dan - To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
