linux-next: manual merge of the workqueues tree with the hid tree

[Stephen Rothwell]

Hi Tejun,

Today's linux-next merge of the workqueues tree got a conflict in
drivers/hid/hid-picolcd.c between commit fabdbf2fd22f ("HID: picoLCD:
split driver code") from the hid tree and commit 43829731dd37
("workqueue: deprecate flush[_delayed]_work_sync()") from the workqueues
tree.

The former commit moved the code changed by the latter into a new file
(and removed the old file) and then a later commit removed the call to
flush_work_sync().  I just removed the file.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature