fix mismerge in ll_rw_blk.c
authorJames Bottomley <jejb@titanic.(none)>
Sun, 28 Aug 2005 15:43:07 +0000 (10:43 -0500)
committerJames Bottomley <jejb@titanic.(none)>
Sun, 28 Aug 2005 15:43:07 +0000 (10:43 -0500)
commit31151ba2cef171344beac254e65bd7e00138bb0d
treea8f9cd3c0395656d974125c0ca7ed635aacddeee
parent3d52acb34247816c453f94596e6c7fc4499b76dc
parent73747aed04d3b3fb694961d025f81863b99c6898
fix mismerge in ll_rw_blk.c
drivers/block/ll_rw_blk.c
drivers/ide/ide-disk.c
fs/bio.c
include/linux/bio.h
include/linux/blkdev.h