linux-next: manual merge of the staging tree with the wireless tree
in [Kernel]
|
Prev: linux-next: manual merge of the cpufreq tree with the acpi tree
Next: [PATCH] x86: remove left over nr_legacy_irqs
From: Greg KH on 23 Feb 2010 22:40 On Mon, Feb 22, 2010 at 04:31:34PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c between commit > e2117cea27c6b27e1a379acac5eb0433eeb7033a ("staging: rtl8192su: fix > compile error from wireless-testing commit") from the wireless tree and > commit 7332868b1aea2a5900a70acadf767f7632b1c2c2 ("Staging: rtl8187x: Use % > pM for mac address output") from the staging tree. > > Just context changes. I fixed it up (see below) and can carry the fix > as necessary. Looks good to me, thanks for doing this. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |