* linux-next: bad merge in the block tree
@ 2012-05-23 2:35 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2012-05-23 2:35 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
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@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-05-23 2:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-23 2:35 linux-next: bad merge in the block tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).