Messages in this thread | | | Date | Tue, 2 Oct 2012 11:13:08 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the v4l-dvb tree with Linus' tree |
| |
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in Documentation/feature-removal-schedule.txt between commit 9c0ece069b32 ("Get rid of Documentation/feature-removal.txt") from Linus' tree and commit 251658e5185e ("[media] Schedule removal of i.MX25 support in mx2_camera.c") from the v4l-dvb tree.
I just removed the file and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |