diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-19 22:17:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-19 22:17:35 -0500 |
| commit | da935c66bacb3ed9ada984b053297f87c2dff63a (patch) | |
| tree | 46278da2b312c73f1375b830d7e5912bf23abd78 /drivers/scsi/arcmsr/arcmsr_attr.c | |
| parent | 9435eb1cf0b76b323019cebf8d16762a50a12a19 (diff) | |
| parent | 2205a6ea93fea76f88b43727fea53f3ce3790d6f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/e1000e/netdev.c
net/xfrm/xfrm_policy.c
Diffstat (limited to 'drivers/scsi/arcmsr/arcmsr_attr.c')
| -rw-r--r-- | drivers/scsi/arcmsr/arcmsr_attr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c index a4e04c50c436..acdae33de521 100644 --- a/drivers/scsi/arcmsr/arcmsr_attr.c +++ b/drivers/scsi/arcmsr/arcmsr_attr.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | ******************************************************************************* | 2 | ******************************************************************************* |
| 3 | ** O.S : Linux | 3 | ** O.S : Linux |
| 4 | ** FILE NAME : arcmsr_attr.c | 4 | ** FILE NAME : arcmsr_attr.c |
| 5 | ** BY : Erich Chen | 5 | ** BY : Nick Cheng |
| 6 | ** Description: attributes exported to sysfs and device host | 6 | ** Description: attributes exported to sysfs and device host |
| 7 | ******************************************************************************* | 7 | ******************************************************************************* |
| 8 | ** Copyright (C) 2002 - 2005, Areca Technology Corporation All rights reserved | 8 | ** Copyright (C) 2002 - 2005, Areca Technology Corporation All rights reserved |