Sorry about the conflict, thanks for redoing the changes. Where can I find the current and development branches? I want to avoid doing this mistake again in the future. Specially since I'm planning on doing some janitorial work on Staging for a while if it's OK with you guys. I see it as nice experience and practice while learning and getting ready for more valuable contributions :)
Sven has told you about how batman uses different repositories. You can find some more information at:
http://www.open-mesh.org/wiki/UsingBatmanGit
When working on other staging drivers i suggest you work on either the linux-next tree, or contact the driver maintainers and ask if they have there own development tree. Staging drivers tend to be fast moving. They change a lot. What is in the current release kernel, which is effectively 3 months old, can be very different to the latest development version. I've received many patches to things we have fixed months ago and are either waiting in linux-next for the next kernel release, or our in or development tree. I'm sure the same applies to other drivers in staging.
Another option for interesting work to get involved in the kernel is to ask GregKH if there is a staging driver which is not being actively worked on. Some drivers just get dumped there and nobody spends the time and effort needed to get them merged. After a while they get thrown out of the staging. You could adopt such a driver, get hold of the hardware and do the work needed to get it out of staging and into the main tree.
Andrew