John updated the wireless trees, but as I had been picking up patches during the merge window I've had to rebase my trees, which I've done now. In addition, I had to merge mac80211 into mac80211-next to not cause a lot of conflicts for later. johannes -- 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
