Subject: expected linux-next conflicts from workqueue/for-3.7

From: Tejun Heo <[email-masked]>
Date: Mon, 20 Aug 2012 15:04:21 -0700

Hello, Stephen.

I just applied patch series to deprecate flush[_delayed]_work_sync().
All in-kernel users are converted to use flush[_delayed]_work()
instead.  It will cause conflicts in the following files on
linux-next.

* drivers/media/video/omap24xxcam.c
* drivers/media/video/cx23885/cx23885-input.c
* drivers/media/video/cx18/cx18-driver.c
* drivers/hid/hid-picolcd.c

The first three files have been renamed and the last file has been
split.  Resolution should be simple and if not, for whatever reason,
the changes can be safely skipped.

Thanks.

-- 
tejun