Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[mv-sheeva.git] / drivers / scsi / qla2xxx / ql6312.c

diff --git a/drivers/scsi/qla2xxx/ql6312.c b/drivers/scsi/qla2xxx/ql6312.c
index 59268eb80acd8e2043a298534dcdd9843d291243..e75882dd4cf63c01d6646ad6bc2865efb0523233 100644 (file)
--- a/drivers/scsi/qla2xxx/ql6312.c
+++ b/drivers/scsi/qla2xxx/ql6312.c
@@ -1,6 +1,6 @@
 /*
  * QLogic ISP6312 device driver for Linux 2.6.x
- * Copyright (C) 2003-2004 QLogic Corporation (www.qlogic.com)
+ * Copyright (C) 2003-2005 QLogic Corporation (www.qlogic.com)
  *
  * Released under GPL v2.
  */