On Wed, Sep 15, 2010 at 01:08:18PM +0200, Vitaly Wool wrote: > On Wed, Sep 15, 2010 at 11:21 AM, Ohad Ben-Cohen <ohad@xxxxxxxxxx> wrote: > > On Wed, Sep 1, 2010 at 11:26 PM, Ohad Ben-Cohen <ohad@xxxxxxxxxx> wrote: > >> This patchset adds wl1271 support on ZOOM2/3 boards. > > > > Tony, John, let me please suggest merging this through the wireless tree. > > > > wl1271 is a moving target - it keeps changing in the wireless tree and > > merging this patchset there will allow wl1271 developers to have > > everything in a single tree (and prevent merge conflicts in > > linux-next). > > Thanks Ohad, that's what I was about to suggest as well. :) OK, that is fine with me if the omap folks agree? 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-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html