diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-07-25 06:31:09 +0200 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-07-25 06:34:40 +0200 |
commit | 6aeea3ecc33b1f36dbc3b80461d15a7052ae424f (patch) | |
tree | bbd273e3e0ca76094aed8e9c77e5adfe2b07f779 /drivers/s390/net/claw.c | |
parent | irqdomain: Fix irq_create_direct_mapping() to test irq_domain type. (diff) | |
parent | Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
download | linux-6aeea3ecc33b1f36dbc3b80461d15a7052ae424f.tar.xz linux-6aeea3ecc33b1f36dbc3b80461d15a7052ae424f.zip |
Merge remote-tracking branch 'origin' into irqdomain/next
Diffstat (limited to 'drivers/s390/net/claw.c')
-rw-r--r-- | drivers/s390/net/claw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c index 6b1ff90d2f00..a0a4afe537d0 100644 --- a/drivers/s390/net/claw.c +++ b/drivers/s390/net/claw.c @@ -1,5 +1,4 @@ /* - * drivers/s390/net/claw.c * ESCON CLAW network driver * * Linux for zSeries version @@ -3380,5 +3379,5 @@ module_exit(claw_cleanup); MODULE_AUTHOR("Andy Richter <richtera@us.ibm.com>"); MODULE_DESCRIPTION("Linux for System z CLAW Driver\n" \ - "Copyright 2000,2008 IBM Corporation\n"); + "Copyright IBM Corp. 2000, 2008\n"); MODULE_LICENSE("GPL"); |