Let's start with the easy part: resolve conflicts and start using net/ieee80211*.h. Replace crypto with the version from net/ieee80211. The latter patch removes drivers/net/wireless/hostap/hostap_crypt*. Hopefully the patch is in format that is easy to apply. If everything goes well, quilt with a small patch will use proper Subject: lines this time.
-- Jouni Malinen PGP id EFC895FA - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
