linux-next: manual merge of the bkl-config tree with the v4l-dvbtree

From: Stephen Rothwell
Date: Tue Dec 28 2010 - 00:26:33 EST

Next message: Mike Galbraith: "Re: [PATCH] sched: Buggy comparison in check_preempt_tick"
Previous message: Toshiharu Okada: "[PATCH] usb: pch_udc: Fixed issue which does not work with g_serial"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Arnd,

Today's linux-next merge of the bkl-config tree got a conflict in
drivers/staging/stradis/Kconfig between commit
aef01debdfad83ab71a83b7af8cd90203404c1aa ("[media] cpia, stradis: remove
deprecated V4L1 drivers") from the v4l-dvb tree and commit
f2fed18d2a61afa5592b3002407e432c689c33f4 ("staging/stradis: mark as
"depends on BKL"") from the bkl-config tree.

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

Attachment: pgp00000.pgp
Description: PGP signature

Next message: Mike Galbraith: "Re: [PATCH] sched: Buggy comparison in check_preempt_tick"
Previous message: Toshiharu Okada: "[PATCH] usb: pch_udc: Fixed issue which does not work with g_serial"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]