Merge ../bleed-2.6

This commit is contained in:
Greg KH
2005-10-28 10:13:16 -07:00
committed by Greg Kroah-Hartman
591 changed files with 23717 additions and 10531 deletions
+1 -1
View File
@@ -119,7 +119,7 @@ struct gendisk {
int policy;
atomic_t sync_io; /* RAID */
unsigned long stamp, stamp_idle;
unsigned long stamp;
int in_flight;
#ifdef CONFIG_SMP
struct disk_stats *dkstats;