On Mon, 2008-10-27 at 15:52 -0700, David Miller wrote: > From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > Date: Sat, 25 Oct 2008 01:50:43 +0200 > > > Also remove a few stray DECLARE_MAC_BUF that were no longer > > used at all. > > > > Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > > --- > > Not sure this will apply to your tree, I prepared it against John's tree > > which might have more things. If you put the previous patch in, I > > suppose John _could_ put it into his tree, but then he'd have to pull in > > yours which he normally doesn't... No idea. I can also just postpone > > this? > > I munged this to apply to my tree, the only conflicts were in > mlme.c Yeah, that's the ones I had too. > Sorry John, one of us had to deal with this :-) John, you can always just take your version, and if I see print_mac show up in mac80211 again then I'll send you another patch. johannes
Attachment:
signature.asc
Description: This is a digitally signed message part
