linux-next: manual merge of the staging-next tree with the v4l-dvb tree

Stephen Rothwell
2010-07-06T07:53:58Z

[-- Attachment #1: Type: text/plain, Size: 635 bytes --]

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/cx25821/cx25821-audups11.c between commit
e302c8255a198a567dab3a4ace7bd0222a6dc037 ("V4L/DVB: cx25821: Removed
duplicate code and cleaned up") from the v4l-dvb tree and commit
231ded903f2f30b2bcdbf6672c7197187e3bb1ee ("Staging: cx25821: added KERN_
facility levels") from the staging-next tree.

The former moved all te code in this file into other files, so I
effectively just dropped the usb patch by deleting this file.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]