linux-next: manual merge of the trivial tree with the wireless-nexttree

[Stephen Rothwell]

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: pgp00000.pgp
Description: PGP signature