|
|
|
linux-next: manual merge of the trivial tree with the wireless-next tree | |
| [Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] | |
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
net/mac80211/work.c between commit e76aadc57228 ("mac80211: revert
on-channel work optimisations") from the wireless-next tree and commit
42b2aa86c667 ("treewide: Fix typos in various parts of the kernel, and
fix some comments") from the trivial tree.
The former removed the comment that was fixed in the latter, so I did
that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpNow1i9pxOj.pgp
Description: PGP signature
|
|