Merge branch 'acpica' into release

[~andy/linux] / drivers / s390 / block / dasd_diag.h

diff --git a/drivers/s390/block/dasd_diag.h b/drivers/s390/block/dasd_diag.h
index 38a4e55f89539b90f514ea9f80b77d4f4d139475..b8c78267ff3ef01ef0e60a1e211784629f2f094e 100644 (file)
--- a/drivers/s390/block/dasd_diag.h
+++ b/drivers/s390/block/dasd_diag.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * File...........: linux/drivers/s390/block/dasd_diag.h
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  * Based on.......: linux/drivers/s390/block/mdisk.h