Hi Andrew, Today's linux-next merge of the akpm tree got a conflict between commit "poll: add poll_requested_events() function" the v4l-dvb and akpm trees. It was very similar (but not identical), so I dropeed it from the akpm tree. BTW Mauro, that commit in v4l-dvb comes from a branch that contains a series of patches that have various Signed-off-by's but not yours ... it looks like they were imported from patchwork, but you forgot to add your SOB line. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgp6idCoyeYT9.pgp
Description: PGP signature
