Merge ssh://gitserver@git.pokylinux.org/poky

26 files changed, 29736 insertions, 773 deletions

diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index b76f897a0b..2a93680409 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -7,5 +7,10 @@ PREFERRED_VERSION_hal ?= "0.5.11"
 PREFERRED_VERSION_hal-info ?= "20080508"
 
 SRCREV_pn-xf86-video-psb ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab"
-SRCREV_pn-libdrm-psb = "aa96c0bbbba11d5bab28bb421a67c2264fad953a"
-SRCREV_pn-linux-mid ?= "cb29ee2997ba598028e1ad4bbdd073deac2d057d"
+SRCREV_pn-twitter-glib ?= "23f06104141d27f77019b58d71503873c38a7341"
+SRCREV_pn-json-glib ?= "1d92c73bc05423872581d513f355783d4864edd5"
+SRCREV_pn-libccss ?= "89f6586a1d96602fd2377627111a77ef80fa01fa"
+SRCREV_pn-librest ?= "631b8a075cf938d1aece6bd6f8379e00596c3dc2"
+SRCREV_pn-mojito ?= "4c2b1dcc0d915b2871c17c3f388a86d4ca69b2cb"
+SRCREV_pn-moblin-menus ?= "fc2d5686e7e9c0e7ebb6c54f1020680f191c8863"
+SRCREV_pn-bickley ?= "d14d1de62a8f9bac829af8ecd84d4426a4fe5a0d"
\ No newline at end of file
diff --git a/meta-moblin/packages/bickley/bickley_git.bb b/meta-moblin/packages/bickley/bickley_git.bb
new file mode 100644
index 0000000000..c52487dbfa
--- /dev/null
+++ b/meta-moblin/packages/bickley/bickley_git.bb
@@ -0,0 +1,10 @@
+
+SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
+PV = "0.0+git${SRCREV}"
+PR = "r1"
+
+DEPENDS = "redland gtk+ dbus-glib clutter-gst-0.8 libexif taglib gupnp gupnp-av"
+
+S = "${WORKDIR}/git"
+
+inherit autotools_stage
diff --git a/meta-moblin/packages/json-glib/json-glib_0.6.2.bb b/meta-moblin/packages/json-glib/json-glib_0.6.2.bb
new file mode 100644
index 0000000000..822ddad7e5
--- /dev/null
+++ b/meta-moblin/packages/json-glib/json-glib_0.6.2.bb
@@ -0,0 +1,7 @@
+
+SRC_URI = "http://folks.o-hand.com/~ebassi/sources/json-glib-0.6.2.tar.gz"
+PR = "r0"
+
+DEPENDS = "glib-2.0"
+
+inherit autotools_stage
diff --git a/meta-moblin/packages/json-glib/json-glib_git.bb b/meta-moblin/packages/json-glib/json-glib_git.bb
new file mode 100644
index 0000000000..fc84accaa1
--- /dev/null
+++ b/meta-moblin/packages/json-glib/json-glib_git.bb
@@ -0,0 +1,14 @@
+HOMEPAGE = "http://live.gnome.org/JsonGlib"
+SRC_URI = "git://github.com/ebassi/${PN}.git;protocol=git"
+PV = "0.6.2+${SRCREV}"
+PR = "r0"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "glib-2.0"
+
+inherit autotools_stage
+
+do_configure_prepend () {
+	touch ${S}/gtk-doc.make
+}
\ No newline at end of file
diff --git a/meta-moblin/packages/libccss/libccss_git.bb b/meta-moblin/packages/libccss/libccss_git.bb
new file mode 100644
index 0000000000..d67fdc0ec6
--- /dev/null
+++ b/meta-moblin/packages/libccss/libccss_git.bb
@@ -0,0 +1,14 @@
+SRC_URI = "git://git.moblin.org/libccss.git;protocol=git;branch=branch-for-nbtk"
+PV = "0.0+git${SRCREV}"
+PR = "r0"
+
+DEPENDS = "glib-2.0 cairo librsvg libsoup-2.4"
+
+S = "${WORKDIR}/git"
+
+inherit autotools_stage
+
+do_configure_prepend () {
+	echo "EXTRA_DIST=" > ${S}/gtk-doc.make
+	echo "CLEANFILES=" >> ${S}/gtk-doc.make
+}
diff --git a/meta-moblin/packages/librest/librest_git.bb b/meta-moblin/packages/librest/librest_git.bb
new file mode 100644
index 0000000000..ec2d676fd5
--- /dev/null
+++ b/meta-moblin/packages/librest/librest_git.bb
@@ -0,0 +1,14 @@
+
+SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
+PV = "0.0+git${SRCREV}"
+PR = "r0"
+
+DEPENDS = "libsoup-2.4"
+
+S = "${WORKDIR}/git"
+
+inherit autotools_stage
+
+do_configure_prepend () {
+	echo "EXTRA_DIST=" > ${S}/gtk-doc.make
+}
diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.27/psb-driver.patch b/meta-moblin/packages/linux/linux-moblin-2.6.27/psb-driver.patch
index adc33b492a..1ef6e378fe 100644
--- a/meta-moblin/packages/linux/linux-moblin-2.6.27/psb-driver.patch
+++ b/meta-moblin/packages/linux/linux-moblin-2.6.27/psb-driver.patch
@@ -1,7 +1,7 @@
 Index: linux-2.6.27/include/drm/drm.h
 ===================================================================
---- linux-2.6.27.orig/include/drm/drm.h	2009-01-14 11:54:35.000000000 +0000
-+++ linux-2.6.27/include/drm/drm.h	2009-01-14 11:58:01.000000000 +0000
+--- linux-2.6.27.orig/include/drm/drm.h	2009-02-05 13:29:29.000000000 +0000
++++ linux-2.6.27/include/drm/drm.h	2009-02-05 13:29:33.000000000 +0000
 @@ -173,6 +173,7 @@
  	_DRM_AGP = 3,		  /**< AGP/GART */
  	_DRM_SCATTER_GATHER = 4,  /**< Scatter/gather memory for PCI DMA */
@@ -380,7 +380,7 @@ Index: linux-2.6.27/include/drm/drm.h
 +	uint32_t value;
 +	unsigned char name[DRM_PROP_NAME_LEN];
 +};
-+		
++
 +struct drm_mode_get_property {
 +
 +	unsigned int prop_id;
@@ -473,8 +473,8 @@ Index: linux-2.6.27/include/drm/drm.h
  #endif
 Index: linux-2.6.27/include/drm/drmP.h
 ===================================================================
---- linux-2.6.27.orig/include/drm/drmP.h	2009-01-14 11:54:35.000000000 +0000
-+++ linux-2.6.27/include/drm/drmP.h	2009-01-14 11:58:31.000000000 +0000
+--- linux-2.6.27.orig/include/drm/drmP.h	2009-02-05 13:29:30.000000000 +0000
++++ linux-2.6.27/include/drm/drmP.h	2009-02-05 13:29:33.000000000 +0000
 @@ -57,6 +57,7 @@
  #include <linux/dma-mapping.h>
  #include <linux/mm.h>
@@ -738,8 +738,8 @@ Index: linux-2.6.27/include/drm/drmP.h
  extern long drm_compat_ioctl(struct file *filp,
 Index: linux-2.6.27/include/drm/drm_pciids.h
 ===================================================================
---- linux-2.6.27.orig/include/drm/drm_pciids.h	2009-01-14 11:54:35.000000000 +0000
-+++ linux-2.6.27/include/drm/drm_pciids.h	2009-01-14 11:58:01.000000000 +0000
+--- linux-2.6.27.orig/include/drm/drm_pciids.h	2008-10-09 23:13:53.000000000 +0100
++++ linux-2.6.27/include/drm/drm_pciids.h	2009-02-05 13:29:33.000000000 +0000
 @@ -413,3 +413,9 @@
  	{0x8086, 0x2e12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
  	{0x8086, 0x2e22, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
@@ -752,8 +752,8 @@ Index: linux-2.6.27/include/drm/drm_pciids.h
 +
 Index: linux-2.6.27/drivers/gpu/drm/Makefile
 ===================================================================
---- linux-2.6.27.orig/drivers/gpu/drm/Makefile	2009-01-14 11:54:35.000000000 +0000
-+++ linux-2.6.27/drivers/gpu/drm/Makefile	2009-01-14 12:11:06.000000000 +0000
+--- linux-2.6.27.orig/drivers/gpu/drm/Makefile	2009-02-05 13:29:29.000000000 +0000
++++ linux-2.6.27/drivers/gpu/drm/Makefile	2009-02-05 13:29:33.000000000 +0000
 @@ -9,11 +9,14 @@
  		drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
  		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
@@ -777,8 +777,8 @@ Index: linux-2.6.27/drivers/gpu/drm/Makefile
 -
 Index: linux-2.6.27/drivers/gpu/drm/drm_agpsupport.c
 ===================================================================
---- linux-2.6.27.orig/drivers/gpu/drm/drm_agpsupport.c	2009-01-14 11:54:35.000000000 +0000
-+++ linux-2.6.27/drivers/gpu/drm/drm_agpsupport.c	2009-01-14 11:58:01.000000000 +0000
+--- linux-2.6.27.orig/drivers/gpu/drm/drm_agpsupport.c	2009-02-05 13:29:29.000000000 +0000
++++ linux-2.6.27/drivers/gpu/drm/drm_agpsupport.c	2009-02-05 13:29:33.000000000 +0000
 @@ -453,47 +453,158 @@
  	return agp_unbind_memory(handle);
  }
@@ -970,7 +970,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_agpsupport.c
 Index: linux-2.6.27/drivers/gpu/drm/drm_bo.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.27/drivers/gpu/drm/drm_bo.c	2009-01-14 11:58:01.000000000 +0000
++++ linux-2.6.27/drivers/gpu/drm/drm_bo.c	2009-02-05 13:29:33.000000000 +0000
 @@ -0,0 +1,2660 @@
 +/**************************************************************************
 + *
@@ -1183,15 +1183,15 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_bo.c
 +			struct drm_bo_mem_reg *old_mem = &bo->mem;
 +			uint64_t save_flags = old_mem->flags;
 +			uint64_t save_mask = old_mem->mask;
-+			
++
 +			*old_mem = *mem;
 +			mem->mm_node = NULL;
 +			old_mem->mask = save_mask;
-+			DRM_FLAG_MASKED(save_flags, mem->flags, 
++			DRM_FLAG_MASKED(save_flags, mem->flags,
 +					DRM_BO_MASK_MEMTYPE);
 +			goto moved;
 +		}
-+		
++
 +	}
 +
 +	if (!(old_man->flags & _DRM_FLAG_MEMTYPE_FIXED) &&
@@ -1939,13 +1939,13 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_bo.c
 +		DRM_ERROR("DRM_BO_FLAG_NO_EVICT is only available to priviliged processes.\n");
 +		return -EPERM;
 +	}
-+	
-+	if (likely(used_mask & DRM_BO_MASK_MEM) && 
++
++	if (likely(used_mask & DRM_BO_MASK_MEM) &&
 +	    (bo->mem.flags & DRM_BO_FLAG_NO_EVICT) &&
 +	    !DRM_SUSER(DRM_CURPROC)) {
-+		if (likely(bo->mem.flags & new_flags & used_mask & 
-+			   DRM_BO_MASK_MEM)) 
-+			new_flags = (new_flags & ~DRM_BO_MASK_MEM) | 
++		if (likely(bo->mem.flags & new_flags & used_mask &
++			   DRM_BO_MASK_MEM))
++			new_flags = (new_flags & ~DRM_BO_MASK_MEM) |
 +				(bo->mem.flags & DRM_BO_MASK_MEM);
 +		else {
 +			DRM_ERROR("Incompatible memory type specification "
@@ -3635,7 +3635,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_bo.c
 Index: linux-2.6.27/drivers/gpu/drm/drm_bo_lock.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.27/drivers/gpu/drm/drm_bo_lock.c	2009-01-14 11:58:01.000000000 +0000
++++ linux-2.6.27/drivers/gpu/drm/drm_bo_lock.c	2009-02-05 13:29:33.000000000 +0000
 @@ -0,0 +1,175 @@
 +/**************************************************************************
 + *
@@ -3815,7 +3815,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_bo_lock.c
 Index: linux-2.6.27/drivers/gpu/drm/drm_bo_move.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.27/drivers/gpu/drm/drm_bo_move.c	2009-01-14 11:58:01.000000000 +0000
++++ linux-2.6.27/drivers/gpu/drm/drm_bo_move.c	2009-02-05 13:29:33.000000000 +0000
 @@ -0,0 +1,597 @@
 +/**************************************************************************
 + *
@@ -4416,8 +4416,8 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_bo_move.c
 +EXPORT_SYMBOL(drm_bo_kunmap);
 Index: linux-2.6.27/drivers/gpu/drm/drm_bufs.c
 ===================================================================
---- linux-2.6.27.orig/drivers/gpu/drm/drm_bufs.c	2009-01-14 11:54:35.000000000 +0000
-+++ linux-2.6.27/drivers/gpu/drm/drm_bufs.c	2009-01-14 11:58:01.000000000 +0000
+--- linux-2.6.27.orig/drivers/gpu/drm/drm_bufs.c	2008-10-09 23:13:53.000000000 +0100
++++ linux-2.6.27/drivers/gpu/drm/drm_bufs.c	2009-02-05 13:29:33.000000000 +0000
 @@ -409,6 +409,7 @@
  		break;
  	case _DRM_SHM:
@@ -4438,7 +4438,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_bufs.c
 Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.27/drivers/gpu/drm/drm_crtc.c	2009-01-14 11:58:01.000000000 +0000
++++ linux-2.6.27/drivers/gpu/drm/drm_crtc.c	2009-02-05 13:29:33.000000000 +0000
 @@ -0,0 +1,2170 @@
 +/*
 + * Copyright (c) 2006-2007 Intel Corporation
@@ -4502,7 +4502,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +
 +	ret = idr_get_new_above(&dev->mode_config.crtc_idr, ptr, 1, &new_id);
 +	if (ret == -EAGAIN)
-+		goto again;	
++		goto again;
 +
 +	return new_id;
 +}
@@ -4573,7 +4573,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +	fb = kzalloc(sizeof(struct drm_framebuffer), GFP_KERNEL);
 +	if (!fb)
 +		return NULL;
-+	
++
 +	fb->id = drm_idr_get(dev, fb);
 +	fb->dev = dev;
 +	dev->mode_config.num_fb++;
@@ -4727,7 +4727,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +	struct drm_output *output;
 +	struct drm_display_mode *mode, *t;
 +	int ret;
-+	//if (maxX == 0 || maxY == 0) 
++	//if (maxX == 0 || maxY == 0)
 +	// TODO
 +
 +	list_for_each_entry(output, &dev->mode_config.output_list, head) {
@@ -4735,7 +4735,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +		/* set all modes to the unverified state */
 +		list_for_each_entry_safe(mode, t, &output->modes, head)
 +			mode->status = MODE_UNVERIFIED;
-+		
++
 +		output->status = (*output->funcs->detect)(output);
 +
 +		if (output->status == output_status_disconnected) {
@@ -4757,7 +4757,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +			if (mode->status == MODE_OK)
 +				mode->status = (*output->funcs->mode_valid)(output,mode);
 +		}
-+		
++
 +
 +		drm_mode_prune_invalid(dev, &output->modes, 1);
 +
@@ -4832,7 +4832,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +	saved_mode = crtc->mode;
 +	saved_x = crtc->x;
 +	saved_y = crtc->y;
-+	
++
 +	/* Update crtc values up front so the driver can rely on them for mode
 +	 * setting.
 +	 */
@@ -4841,21 +4841,21 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +	crtc->y = y;
 +
 +	/* XXX short-circuit changes to base location only */
-+	
++
 +	/* Pass our mode to the outputs and the CRTC to give them a chance to
 +	 * adjust it according to limitations or output properties, and also
 +	 * a chance to reject the mode entirely.
 +	 */
 +	list_for_each_entry(output, &dev->mode_config.output_list, head) {
-+		
++
 +		if (output->crtc != crtc)
 +			continue;
-+		
++
 +		if (!output->funcs->mode_fixup(output, mode, adjusted_mode)) {
 +			goto done;
 +		}
 +	}
-+	
++
 +	if (!crtc->funcs->mode_fixup(crtc, mode, adjusted_mode)) {
 +		goto done;
 +	}
@@ -4865,13 +4865,13 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +
 +		if (output->crtc != crtc)
 +			continue;
-+		
++
 +		/* Disable the output as the first thing we do. */
 +		output->funcs->prepare(output);
 +	}
-+	
++
 +	crtc->funcs->prepare(crtc);
-+	
++
 +	/* Set up the DPLL and any output state that needs to adjust or depend
 +	 * on the DPLL.
 +	 */
@@ -4881,12 +4881,12 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +
 +		if (output->crtc != crtc)
 +			continue;
-+		
++
 +		DRM_INFO("%s: set mode %s %x\n", output->name, mode->name, mode->mode_id);
 +
 +		output->funcs->mode_set(output, mode, adjusted_mode);
 +	}
-+	
++
 +	/* Now, enable the clocks, plane, pipe, and outputs that we set up. */
 +	crtc->funcs->commit(crtc);
 +
@@ -4894,7 +4894,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +
 +		if (output->crtc != crtc)
 +			continue;
-+		
++
 +		output->funcs->commit(output);
 +
 +#if 0 // TODO def RANDR_12_INTERFACE
@@ -4902,7 +4902,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +			RRPostPendingProperties (output->randr_output);
 +#endif
 +	}
-+	
++
 +	/* XXX free adjustedmode */
 +	drm_mode_destroy(dev, adjusted_mode);
 +	ret = 1;
@@ -4916,10 +4916,10 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +		crtc->y = saved_y;
 +		crtc->mode = saved_mode;
 +	}
-+	
++
 +	if (didLock)
 +		crtc->funcs->unlock (crtc);
-+	
++
 +	return ret;
 +}
 +EXPORT_SYMBOL(drm_crtc_set_mode);
@@ -4958,7 +4958,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 + *
 + * LOCKING:
 + * Caller must hold mode config lock.
-+ * 
++ *
 + * Add @mode to @output's mode list for later use.
 + */
 +void drm_mode_probed_add(struct drm_output *output,
@@ -4975,7 +4975,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 + *
 + * LOCKING:
 + * Caller must hold mode config lock.
-+ * 
++ *
 + * Remove @mode from @output's mode list, then free it.
 + */
 +void drm_mode_remove(struct drm_output *output, struct drm_display_mode *mode)
@@ -5009,7 +5009,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +	output = kzalloc(sizeof(struct drm_output), GFP_KERNEL);
 +	if (!output)
 +		return NULL;
-+		
++
 +	output->dev = dev;
 +	output->funcs = funcs;
 +	output->id = drm_idr_get(dev, output);
@@ -5197,7 +5197,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +		ret = -EINVAL;
 +		goto out_err;
 +	}
-+	
++
 +	*bo = drm_user_object_entry(uo, struct drm_buffer_object, base);
 +	ret = 0;
 +out_err:
@@ -5228,7 +5228,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +
 +	list_for_each_entry(output, &dev->mode_config.output_list, head) {
 +       		output->crtc = NULL;
-+    
++
 +    		/* Don't hook up outputs that are disconnected ??
 +		 *
 +		 * This is debateable. Do we want fixed /dev/fbX or
@@ -5280,7 +5280,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +			c++;
 +			if ((output->possible_crtcs & (1 << c)) == 0)
 +		    		continue;
-+	
++
 +			list_for_each_entry(output_equal, &dev->mode_config.output_list, head) {
 +				if (output->id == output_equal->id)
 +					continue;
@@ -5368,7 +5368,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +		dev->driver->fb_probe(dev, crtc);
 +	}
 +
-+	/* This is a little screwy, as we've already walked the outputs 
++	/* This is a little screwy, as we've already walked the outputs
 +	 * above, but it's a little bit of magic too. There's the potential
 +	 * for things not to get setup above if an existing device gets
 +	 * re-assigned thus confusing the hardware. By walking the outputs
@@ -5583,7 +5583,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +	strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN);
 +	out->name[DRM_DISPLAY_MODE_LEN-1] = 0;
 +}
-+	
++
 +/**
 + * drm_mode_getresources - get graphics configuration
 + * @inode: inode from the ioctl
@@ -5687,7 +5687,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +		}
 +	}
 +	card_res->count_outputs = output_count;
-+	
++
 +	/* Modes */
 +	if (card_res->count_modes >= mode_count) {
 +		copied = 0;
@@ -5715,7 +5715,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +	DRM_DEBUG("Counted %d %d %d\n", card_res->count_crtcs,
 +		  card_res->count_outputs,
 +		  card_res->count_modes);
-+	
++
 +	mutex_unlock(&dev->mode_config.mutex);
 +	return ret;
 +}
@@ -5819,7 +5819,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +
 +	list_for_each_entry(mode, &output->modes, head)
 +		mode_count++;
-+	
++
 +	for (i = 0; i < DRM_OUTPUT_MAX_UMODES; i++)
 +		if (output->user_mode_ids[i] != 0)
 +			mode_count++;
@@ -5933,13 +5933,13 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +		mode = idr_find(&dev->mode_config.crtc_idr, crtc_req->mode);
 +		if (!mode || (mode->mode_id != crtc_req->mode)) {
 +			struct drm_output *output;
-+			
-+			list_for_each_entry(output, 
++
++			list_for_each_entry(output,
 +					    &dev->mode_config.output_list,
 +					    head) {
 +				list_for_each_entry(mode, &output->modes,
 +						    head) {
-+					drm_mode_debug_printmodeline(dev, 
++					drm_mode_debug_printmodeline(dev,
 +								     mode);
 +				}
 +			}
@@ -5988,7 +5988,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +			output_set[i] = output;
 +		}
 +	}
-+		
++
 +	ret = drm_crtc_set_config(crtc, crtc_req, mode, output_set, fb);
 +
 +out:
@@ -6349,7 +6349,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +	struct drm_display_mode *mode;
 +	int ret = -EINVAL;
 +
-+	mutex_lock(&dev->mode_config.mutex);	
++	mutex_lock(&dev->mode_config.mutex);
 +	mode = idr_find(&dev->mode_config.crtc_idr, *id);
 +	if (!mode || (*id != mode->mode_id)) {
 +		goto out;
@@ -6448,7 +6448,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +
 +
 +	ret = drm_mode_detachmode(dev, output, mode);
-+out:	       
++out:
 +	mutex_unlock(&dev->mode_config.mutex);
 +	return ret;
 +}
@@ -6461,7 +6461,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +	property = kzalloc(sizeof(struct drm_output), GFP_KERNEL);
 +	if (!property)
 +		return NULL;
-+	
++
 +	property->values = kzalloc(sizeof(uint32_t)*num_values, GFP_KERNEL);
 +	if (!property->values)
 +		goto fail;
@@ -6493,7 +6493,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +	if (!list_empty(&property->enum_list)) {
 +		list_for_each_entry(prop_enum, &property->enum_list, head) {
 +			if (prop_enum->value == value) {
-+				strncpy(prop_enum->name, name, DRM_PROP_NAME_LEN); 
++				strncpy(prop_enum->name, name, DRM_PROP_NAME_LEN);
 +				prop_enum->name[DRM_PROP_NAME_LEN-1] = '\0';
 +				return 0;
 +			}
@@ -6504,7 +6504,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +	if (!prop_enum)
 +		return -ENOMEM;
 +
-+	strncpy(prop_enum->name, name, DRM_PROP_NAME_LEN); 
++	strncpy(prop_enum->name, name, DRM_PROP_NAME_LEN);
 +	prop_enum->name[DRM_PROP_NAME_LEN-1] = '\0';
 +	prop_enum->value = value;
 +
@@ -6526,7 +6526,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +	kfree(property->values);
 +	drm_idr_put(dev, property->id);
 +	list_del(&property->head);
-+	kfree(property);	
++	kfree(property);
 +}
 +EXPORT_SYMBOL(drm_property_destroy);
 +
@@ -6612,8 +6612,8 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_crtc.c
 +}
 Index: linux-2.6.27/drivers/gpu/drm/drm_drv.c
 ===================================================================
---- linux-2.6.27.orig/drivers/gpu/drm/drm_drv.c	2009-01-14 11:54:35.000000000 +0000
-+++ linux-2.6.27/drivers/gpu/drm/drm_drv.c	2009-01-14 11:58:01.000000000 +0000
+--- linux-2.6.27.orig/drivers/gpu/drm/drm_drv.c	2009-02-05 13:29:29.000000000 +0000
++++ linux-2.6.27/drivers/gpu/drm/drm_drv.c	2009-02-05 13:29:33.000000000 +0000
 @@ -49,6 +49,9 @@
  #include "drmP.h"
  #include "drm_core.h"
@@ -6833,7 +6833,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_drv.c
 Index: linux-2.6.27/drivers/gpu/drm/drm_edid.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.27/drivers/gpu/drm/drm_edid.c	2009-01-14 11:58:01.000000000 +0000
++++ linux-2.6.27/drivers/gpu/drm/drm_edid.c	2009-02-05 13:29:33.000000000 +0000
 @@ -0,0 +1,519 @@
 +/*
 + * Copyright (c) 2007 Intel Corporation
@@ -7157,7 +7157,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_edid.c
 +			if (i == 0 && edid->preferred_timing)
 +				newmode->type |= DRM_MODE_TYPE_PREFERRED;
 +			drm_mode_probed_add(output, newmode);
-+				     
++
 +			modes++;
 +			continue;
 +		}
@@ -7303,7 +7303,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_edid.c
 + * @adapter: i2c adapter to use for DDC
 + *
 + * Poke the given output's i2c channel to grab EDID data if possible.
-+ * 
++ *
 + * Return edid data or NULL if we couldn't find any.
 + */
 +struct edid *drm_get_edid(struct drm_output *output,
@@ -7357,7 +7357,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_edid.c
 Index: linux-2.6.27/drivers/gpu/drm/drm_fence.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.27/drivers/gpu/drm/drm_fence.c	2009-01-14 11:58:01.000000000 +0000
++++ linux-2.6.27/drivers/gpu/drm/drm_fence.c	2009-02-05 13:29:33.000000000 +0000
 @@ -0,0 +1,829 @@
 +/**************************************************************************
 + *
@@ -7398,7 +7398,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_fence.c
 + */
 +
 +int drm_fence_wait_polling(struct drm_fence_object *fence, int lazy,
-+			   int interruptible, uint32_t mask, 
++			   int interruptible, uint32_t mask,
 +			   unsigned long end_jiffies)
 +{
 +	struct drm_device *dev = fence->dev;
@@ -7411,9 +7411,9 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_fence.c
 +	add_wait_queue(&fc->fence_queue, &entry);
 +
 +	ret = 0;
-+	
++
 +	for (;;) {
-+		__set_current_state((interruptible) ? 
++		__set_current_state((interruptible) ?
 +				    TASK_INTERRUPTIBLE :
 +				    TASK_UNINTERRUPTIBLE);
 +		if (drm_fence_object_signaled(fence, mask))
@@ -7427,10 +7427,10 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_fence.c
 +		else if ((++count & 0x0F) == 0){
 +			__set_current_state(TASK_RUNNING);
 +			schedule();
-+			__set_current_state((interruptible) ? 
++			__set_current_state((interruptible) ?
 +					    TASK_INTERRUPTIBLE :
 +					    TASK_UNINTERRUPTIBLE);
-+		}			
++		}
 +		if (interruptible && signal_pending(current)) {
 +			ret = -EAGAIN;
 +			break;
@@ -7527,12 +7527,12 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_fence.c
 +				driver->sequence_mask;
 +			if (diff > driver->wrap_diff)
 +				break;
-+			
++
 +			fc->waiting_types |= fence->waiting_types & ~fence->signaled_types;
 +		}
 +	}
 +
-+	if (wake) 
++	if (wake)
 +		wake_up_all(&fc->fence_queue);
 +}
 +EXPORT_SYMBOL(drm_fence_handler);
@@ -7621,7 +7621,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_fence.c
 +	struct drm_device *dev = fence->dev;
 +	struct drm_fence_manager *fm = &dev->fm;
 +	struct drm_fence_driver *driver = dev->driver->fence_driver;
-+	
++
 +	mask &= fence->type;
 +	read_lock_irqsave(&fm->lock, flags);
 +	signaled = (mask & fence->signaled_types) == mask;
@@ -7658,7 +7658,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_fence.c
 +	write_lock_irqsave(&fm->lock, irq_flags);
 +	fence->waiting_types |= type;
 +	fc->waiting_types |= fence->waiting_types;
-+	diff = (fence->sequence - fc->highest_waiting_sequence) & 
++	diff = (fence->sequence - fc->highest_waiting_sequence) &
 +		driver->sequence_mask;
 +
 +	if (diff < driver->wrap_diff)
@@ -7670,7 +7670,7 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_fence.c
 +	 */
 +
 +	saved_pending_flush = fc->pending_flush;
-+	if (driver->needed_flush) 
++	if (driver->needed_flush)
 +		fc->pending_flush |= driver->needed_flush(fence);
 +
 +	if (driver->poll)
@@ -7709,14 +7709,14 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_fence.c
 +		diff = (sequence - fence->sequence) & driver->sequence_mask;
 +		if (diff <= driver->flush_diff)
 +			break;
-+	
++
 +		fence->waiting_types = fence->type;
 +		fc->waiting_types |= fence->type;
 +
 +		if (driver->needed_flush)
 +			fc->pending_flush |= driver->needed_flush(fence);
-+	}	
-+	
++	}
++
 +	if (driver->poll)
 +		driver->poll(dev, fence_class, fc->waiting_types);
 +
@@ -7758,13 +7758,13 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_fence.c
 +	if (driver->has_irq(dev, fence->fence_class, mask)) {
 +		if (!ignore_signals)
 +			ret = wait_event_interruptible_timeout
-+				(fc->fence_queue, 
-+				 drm_fence_object_signaled(fence, mask), 
++				(fc->fence_queue,
++				 drm_fence_object_signaled(fence, mask),
 +				 3 * DRM_HZ);
-+		else 
++		else
 +			ret = wait_event_timeout
-+				(fc->fence_queue, 
-+				 drm_fence_object_signaled(fence, mask), 
++				(fc->fence_queue,
++				 drm_fence_object_signaled(fence, mask),
 +				 3 * DRM_HZ);
 +
 +		if (unlikely(ret == -ERESTARTSYS))
@@ -8190,8 +8190,8 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_fence.c
 +}
 Index: linux-2.6.27/drivers/gpu/drm/drm_fops.c
 ===================================================================
---- linux-2.6.27.orig/drivers/gpu/drm/drm_fops.c	2009-01-14 11:54:35.000000000 +0000
-+++ linux-2.6.27/drivers/gpu/drm/drm_fops.c	2009-01-14 11:58:01.000000000 +0000
+--- linux-2.6.27.orig/drivers/gpu/drm/drm_fops.c	2009-02-05 13:29:29.000000000 +0000
++++ linux-2.6.27/drivers/gpu/drm/drm_fops.c	2009-02-05 13:29:33.000000000 +0000
 @@ -231,6 +231,7 @@
  	int minor_id = iminor(inode);
  	struct drm_file *priv;
@@ -8279,8 +8279,8 @@ Index: linux-2.6.27/drivers/gpu/drm/drm_fops.c
  
 Index: linux-2.6.27/drivers/gpu/drm/drm_hashtab.c
 ===================================================================
---- linux-2.6.27.orig/drivers/gpu/drm/drm_hashtab.c	2009-01-14 11:54:35.000000000 +0000
-+++ linux-2.6.27/drivers/gpu/drm/drm_hashtab.c	2009-01-14 11:58:01.000000000 +0000
+--- li