Merge by hand (whitespace conflicts in libata.h)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
James Bottomley
2005-11-10 08:29:07 -06:00
744 changed files with 49072 additions and 16496 deletions

View File

@@ -48,10 +48,6 @@
#include <linux/stat.h>
#ifndef LINUX_VERSION_CODE
#include <linux/version.h>
#endif
#include "scsi_logging.h"
#include "scsi_debug.h"