On Sat, Feb 17, 2007 at 03:24:27PM -0500, Jeff Garzik wrote: > John W. Linville wrote: > >Some late-breaking small and/or important changes before the 2.6.21 > >merge window closes... > ACK. Tried to pull, but there were conflicts with netdev#upstream. > Since there are dependencies in netdev#upstream, looks like you need to > resend against that. Ah, yes...I cloned your 'upstream' branch, pulled from my 'upstream' branch, resolved the conflicts, and committed on my new 'upstream-jgarzik' branch. Please pull from here: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-jgarzik Thanks! John -- John W. Linville linville@xxxxxxxxxxxxx - 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
