Merge branch 'upstream' into bugfix-video

Update bugfix-video branch to 2.5-rc1
so I don't have to again resolve the
conflict in these patches vs. upstream.

Conflicts:
	drivers/gpu/drm/gma500/psb_drv.c

	text conflict: add comment vs delete neighboring line

	keep just this:
	/* igd_opregion_init(&dev_priv->opregion_dev); */
	/* acpi_video_register(); */

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
index 3a4cef5322dc..12291a7ee275 100644
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
@@ -165,8 +165,8 @@ struct fid {
  */
 
 struct export_operations {
-        int (*encode_fh)(struct dentry *de, __u32 *fh, int *max_len,
-                        int connectable);
+        int (*encode_fh)(struct inode *inode, __u32 *fh, int *max_len,
+                        struct inode *parent);
         struct dentry * (*fh_to_dentry)(struct super_block *sb, struct fid *fid,
                         int fh_len, int fh_type);
         struct dentry * (*fh_to_parent)(struct super_block *sb, struct fid *fid,