summaryrefslogtreecommitdiffstats
path: root/drivers/ata/ahci.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-08 21:18:09 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-08 21:18:09 -0700
commitb37668d0808a1bf15d05e678f431fb5fb4659c90 (patch)
treec53c3f1c7043e87954f4b253332a3f577f99d1ce /drivers/ata/ahci.h
parent451372066dab1d98ba571b176bd1ce71922702f2 (diff)
parent317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff)
downloadblackbird-op-linux-b37668d0808a1bf15d05e678f431fb5fb4659c90.tar.gz
blackbird-op-linux-b37668d0808a1bf15d05e678f431fb5fb4659c90.zip
Merge 3.10-rc5 into staging-next
Diffstat (limited to 'drivers/ata/ahci.h')
-rw-r--r--drivers/ata/ahci.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index b830e6c9fe49..10b14d45cfd2 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -1,7 +1,7 @@
/*
* ahci.h - Common AHCI SATA definitions and declarations
*
- * Maintained by: Jeff Garzik <jgarzik@pobox.com>
+ * Maintained by: Tejun Heo <tj@kernel.org>
* Please ALWAYS copy linux-ide@vger.kernel.org
* on emails.
*
OpenPOWER on IntegriCloud