Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel

[linux-2.6-omap-h63xx.git] / drivers / s390 / block / dasd_9343_erp.c

diff --git a/drivers/s390/block/dasd_9343_erp.c b/drivers/s390/block/dasd_9343_erp.c
index 4a5b79569aaaa463461f55a25dffc09f0d9b3b32..ddecb9808ed4b1c08e22399b8bb7151fc0cd636e 100644 (file)
--- a/drivers/s390/block/dasd_9343_erp.c
+++ b/drivers/s390/block/dasd_9343_erp.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * File...........: linux/drivers/s390/block/dasd_9345_erp.c
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>