On Wed, 2008-09-17 at 17:43 +1000, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/mac80211_hwsim.c between commit
> 121e2082a81c7988a1399c1a5f43795c95225de2 ("device create: net: convert
> device_create_drvdata to device_create") from the driver-core tree and
> commit init_mac80211_hwsim( ("mac80211 hwsim: make radio list dynamic")
> from the wireless tree.
>
> The former modified the context of the latter. I fixed it up (see below)
> and can carry the fix.
Looks fine to me, thanks.
johannes
Attachment:
signature.asc
Description: This is a digitally signed message part
