diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2011-05-25 09:04:07 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-05-25 09:04:07 -0400 |
| commit | f2889fee8c7fe0ac9752186d43f9486392bb204d (patch) | |
| tree | 5e9fbc2e5a6d40ddb8ed8c78c502f6e26ae3d6b3 /include | |
| parent | 6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff) | |
| parent | aecb7b64dd9e2512c7a4c7e61dd781415d3dac5a (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dw_dmac.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/dw_dmac.h b/include/linux/dw_dmac.h index 6998d9376ef9..4bfe0a2f7d50 100644 --- a/include/linux/dw_dmac.h +++ b/include/linux/dw_dmac.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * AVR32 systems.) | 3 | * AVR32 systems.) |
| 4 | * | 4 | * |
| 5 | * Copyright (C) 2007 Atmel Corporation | 5 | * Copyright (C) 2007 Atmel Corporation |
| 6 | * Copyright (C) 2010-2011 ST Microelectronics | ||
| 6 | * | 7 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
| 8 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |