There are several conflicts in the latest rounds of the wireless trees. Most of them are simple. One of them involves transporting some changes from "orinoco: do not resgister NULL pm_notifier function" between drivers/net/orinoco/orinoco.c (which no longer exists in -next) over to drivers/net/orinoco/main.c. I have an example 'merge-test' branch in wireless-next-2.6 to show how I think the conflicts should be resolved -- enjoy! :-) Thanks, 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-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
