Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3
Commit:     70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3
Parent:     c18c842b1fdf527717303a4e173cbece7ab2deb8
Author:     Steve French <[EMAIL PROTECTED]>
AuthorDate: Thu Jul 19 00:32:25 2007 +0000
Committer:  Steve French <[EMAIL PROTECTED]>
CommitDate: Thu Jul 19 00:32:25 2007 +0000

    [CIFS] merge conflict in fs/cifs/export.c
    
    Signed-off-by: Steve French <[EMAIL PROTECTED]>
---
 fs/cifs/export.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fs/cifs/export.c b/fs/cifs/export.c
index 1570cc6..c21d3d0 100644
--- a/fs/cifs/export.c
+++ b/fs/cifs/export.c
@@ -40,6 +40,7 @@
   */
 
 #include <linux/fs.h>
+#include <linux/exportfs.h>
 #include "cifsglob.h"
 #include "cifs_debug.h"
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to