I just sent a pull request for Dave that will result in a merge conflict in linux-next. I have a sample merge available here: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test Just a heads-up... :-) John P.S. These are one-liners (including the one from yesterday). Nevertheless, it can't hurt to provide a reference "just in case"... :-) -- 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
