linux-next: bad merge in the block tree
From: Stephen Rothwell <hidden>
Date: 2012-05-23 02:35:13
Also in:
lkml
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 Attachments
- (unnamed) [application/pgp-signature] 836 bytes