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

From: Stephen Rothwell
Date: Thu Apr 07 2011 - 23:27:59 EST

Next message: UNITED NATIONS: "WESTERN UNION ENCLOSED"
Previous message: Sonny Rao: "Re: [PATCH] Enable async suspend/resume on industrial IO devices"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/dvb/frontends/drx397xD.c between commit 25985edcedea ("Fix
common misspellings") from Linus' tree and commit a8e8541bc7af ("Remove
the now obsolete drx397xD") from the v4l-dvb tree.

The latter removed the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature

Next message: UNITED NATIONS: "WESTERN UNION ENCLOSED"
Previous message: Sonny Rao: "Re: [PATCH] Enable async suspend/resume on industrial IO devices"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]