Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel

1 files changed, 16 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 2b349ba4add4..77cbfb1a696c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1431,6 +1431,14 @@ P:	Russell King
 M:      linux@arm.linux.org.uk
 F:      include/linux/clk.h
 
+CISCO FCOE HBA DRIVER
+P:      Abhijeet Joglekar
+M:      abjoglek@cisco.com
+P:      Joe Eykholt
+M:      jeykholt@cisco.com
+L:      linux-scsi@vger.kernel.org
+S:      Supported
+
 CODA FILE SYSTEM
 P:      Jan Harkes
 M:      jaharkes@cs.cmu.edu
@@ -5579,6 +5587,14 @@ M:	ian@mnementh.co.uk
 S:      Maintained
 F:      drivers/mmc/host/tmio_mmc.*
 
+TMPFS (SHMEM FILESYSTEM)
+P:      Hugh Dickins
+M:      hugh.dickins@tiscali.co.uk
+L:      linux-mm@kvack.org
+S:      Maintained
+F:      include/linux/shmem_fs.h
+F:      mm/shmem.c
+
 TPM DEVICE DRIVER
 P:      Debora Velarde
 M:      debora@linux.vnet.ibm.com