diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-12 19:50:10 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-12 19:50:10 -0400 |
| commit | ff299f1b1cb4e0c44a3f76d1f8ee4eb2f64f098f (patch) | |
| tree | 9e4d85cfc0c5a8394bc1fcafd7c406c5ac558c70 /drivers/ata/acard-ahci.c | |
| parent | 7d428ce284fce4aacb215ca15d0274e7261864a3 (diff) | |
| parent | ae7b6dccf6711e8d5815688f1572ab55bf5b3069 (diff) | |
Merge tag 's3c24xx-driver-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
From Kukjin Kim, driver updats for s3c24xx:
- move cpufreq driver into drivers/
- add pinctrl-s3c24xx driver
- cleanup OF in gpio driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/ata/acard-ahci.c')
| -rw-r--r-- | drivers/ata/acard-ahci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/acard-ahci.c b/drivers/ata/acard-ahci.c index 4e94ba29cb8d..9d0cf019ce59 100644 --- a/drivers/ata/acard-ahci.c +++ b/drivers/ata/acard-ahci.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | /* | 2 | /* |
| 3 | * acard-ahci.c - ACard AHCI SATA support | 3 | * acard-ahci.c - ACard AHCI SATA support |
| 4 | * | 4 | * |
| 5 | * Maintained by: Jeff Garzik <jgarzik@pobox.com> | 5 | * Maintained by: Tejun Heo <tj@kernel.org> |
| 6 | * Please ALWAYS copy linux-ide@vger.kernel.org | 6 | * Please ALWAYS copy linux-ide@vger.kernel.org |
| 7 | * on emails. | 7 | * on emails. |
| 8 | * | 8 | * |