Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/media/video/zr364xx.c between commit
69025c934b21a9ce49a76dfef59f1ebdfbe96c78 ("V4L/DVB (8731): zr364xx:
remove BKL") from Linus' tree and commit
598abe853e0084a625b0d554fa9afe8562bd2aa7 ("USB: remove info() macro from
usb media drivers") from the usb tree.
I fixed it up by using he version in Linus' tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpCv53kE1m0e.pgp
Description: PGP signature
