On Wed, Mar 02, 2011 at 05:27:54PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/brcm80211/brcmsmac/wl_mac80211.c between commit > 7bb4568372856688bc070917265bce0b88bb7d4d ("mac80211: make tx() operation > return void") from the wireless tree (where this file is called > drivers/staging/brcm80211/sys/wl_mac80211.c) and commits > 62b54dca17ef40116491b0ca27ca35fbe9daedc6 ("staging: brcm80211: cleanup > function prototypes in header files") and > 55182a10063c40eda4dc5afecff712e5c3617ffc ("staging: brcm80211: cosmetic > changes") from the staging tree. > > I fixed it up (see below) and can carry the fix as necessary. Thanks, that looks good to me. greg k-h -- 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