Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[~andy/linux] / arch / s390 / kernel / irq.c

diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index b4f4a7133fa10e3456b82f7f27fc8fbf70d942ed..dd7630d8aab7ce11ca405fb0c6da17f51b4998d6 100644 (file)
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -1,5 +1,5 @@
 /*
- *    Copyright IBM Corp. 2004,2011
+ *    Copyright IBM Corp. 2004, 2011
  *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>,
  *              Holger Smolinski <Holger.Smolinski@de.ibm.com>,
  *              Thomas Spatzier <tspat@de.ibm.com>,