diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /drivers/scsi/sym53c8xx_2/sym_malloc.c | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'drivers/scsi/sym53c8xx_2/sym_malloc.c')
| -rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_malloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_malloc.c b/drivers/scsi/sym53c8xx_2/sym_malloc.c index 883cac10daf9..6f9af0de7ec3 100644 --- a/drivers/scsi/sym53c8xx_2/sym_malloc.c +++ b/drivers/scsi/sym53c8xx_2/sym_malloc.c | |||
| @@ -50,7 +50,7 @@ | |||
| 50 | * from the SCRIPTS code. In addition, cache line alignment | 50 | * from the SCRIPTS code. In addition, cache line alignment |
| 51 | * is guaranteed for power of 2 cache line size. | 51 | * is guaranteed for power of 2 cache line size. |
| 52 | * | 52 | * |
| 53 | * This allocator has been developped for the Linux sym53c8xx | 53 | * This allocator has been developed for the Linux sym53c8xx |
| 54 | * driver, since this O/S does not provide naturally aligned | 54 | * driver, since this O/S does not provide naturally aligned |
| 55 | * allocations. | 55 | * allocations. |
| 56 | * It has the advantage of allowing the driver to use private | 56 | * It has the advantage of allowing the driver to use private |