Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block
Manual fixup for merge with Jens' "Suspend support for libata", commit
ID 9b84754866
.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
@@ -398,7 +398,6 @@ struct scsi_host_template {
|
||||
/*
|
||||
* ordered write support
|
||||
*/
|
||||
unsigned ordered_flush:1;
|
||||
unsigned ordered_tag:1;
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user