summaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/hardirq.h
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-08-01 12:40:02 +0200
committerNeilBrown <neilb@suse.de>2012-08-01 12:40:02 +0200
commitbb181e2e48f8c85db08c9cb015cbba9618dbf05c (patch)
tree191bc24dd97bcb174535cc217af082f16da3b43d /arch/s390/include/asm/hardirq.h
parentmd/RAID1: Add missing case for attempting to repair known bad blocks. (diff)
parentdm raid: move sectors_per_dev calculation (diff)
downloadlinux-bb181e2e48f8c85db08c9cb015cbba9618dbf05c.tar.xz
linux-bb181e2e48f8c85db08c9cb015cbba9618dbf05c.zip
Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md
Pull in pre-requisites for adding raid10 support to dm-raid.
Diffstat (limited to 'arch/s390/include/asm/hardirq.h')
-rw-r--r--arch/s390/include/asm/hardirq.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/s390/include/asm/hardirq.h b/arch/s390/include/asm/hardirq.h
index 510ba9ef4248..0c82ba86e997 100644
--- a/arch/s390/include/asm/hardirq.h
+++ b/arch/s390/include/asm/hardirq.h
@@ -1,8 +1,6 @@
/*
- * include/asm-s390/hardirq.h
- *
* S390 version
- * Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ * Copyright IBM Corp. 1999, 2000
* Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
* Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
*