On Thu, Jun 04, 2009 at 01:58:09AM +0200, Samuel Ortiz wrote: > Hi Johannes > > On Wed, 2009-06-03 at 18:30 +0200, Johannes Berg wrote: > > * iwm doesn't depend on cfg80211 or wireless extensions > This one will conflict with a patch Yi sent a week ago. > Dave Miller applied it to his net-next-2.6 tree, commit > d0fc1d5e3fe869f8a32a2bc1dd02d8383a057164. > See also: > http://marc.info/?l=linux-wireless&m=124331653022408&w=2 Don't worry, I have the conflict resolved in wireless-next-2.6... John -- John W. Linville Someday the world will need a hero, and you linville@xxxxxxxxxxxxx might be all we have. Be ready. -- 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
