linux-next: bad merge in the block tree

From: Stephen Rothwell
Date: Tue May 22 2012 - 22:35:13 EST

Next message: Anton Vorontsov: "[PATCH/RFC] Make sure linux_banner is the first message in log_buf"
Previous message: Chen Gong: "[PATCH] x86: auto poll/interrupt mode switch for CMC to stop CMC storm"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Jens,

Commit 21731057017b ("Merge branch 'for-3.5/drivers' into for-next") has
left a conflict marker in Documentation/feature-removal-schedule.txt ...

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature

Next message: Anton Vorontsov: "[PATCH/RFC] Make sure linux_banner is the first message in log_buf"
Previous message: Chen Gong: "[PATCH] x86: auto poll/interrupt mode switch for CMC to stop CMC storm"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]