Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f1bc3dc6b3699de3c072bfce91b3ec25417e41cb..2a2cddd2f88c0e1b1e9abe167c162a8550cacb8e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -557,6 +557,13 @@ S: Maintained
 F:     drivers/net/appletalk/
 F:     net/appletalk/
 
+ARASAN COMPACT FLASH PATA CONTROLLER
+M:     Viresh Kumar <viresh.kumar@st.com>
+L:     linux-ide@vger.kernel.org
+S:     Maintained
+F:     include/linux/pata_arasan_cf_data.h
+F:     drivers/ata/pata_arasan_cf.c
+
 ARC FRAMEBUFFER DRIVER
 M:     Jaya Kumar <jayalk@intworks.biz>
 S:     Maintained