Hi,
I have reset the wl12xx/master branch, because there were lots of merge
conflicts to resolve and I reckoned it was not worth the trouble.
Sorry for the trouble this causes, but if you had anything on top of
this tree before I reset it, you'll have to rebase.
I'll always try to avoid this as much as possible, but in some cases it
will be necessary.
The other branches, wireless-next (which is the one feeding John's tree)
and wl12xx-next, which is the "stable" wl12xx branch, have not been
changed and are still linear.
And, in case you're wondering, the wireless-testing branch is only used
eventually, to push things to John's wireless-testing tree. You
shouldn't care about that one.
--
Cheers,
Luca.