commit 7c8460db30dfd085ef3837c8fb02ecf2e718b983 Author: Zhenyu Wang Date: Tue Sep 8 14:52:25 2009 +0800 drm/i915: fix mask bits setting eDP is exclusive connector too, and add missing crtc_mask setting for TV. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=14139 Signed-off-by: Zhenyu Wang Reported-and-tested-by: Carlos R. Mafra Signed-off-by: Linus Torvalds commit 3ff323f89075624b6891e7c428edb8e8a35be13c Merge: 755ae76 a54775c Author: Linus Torvalds Date: Mon Sep 7 11:42:25 2009 -0700 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms: add LTE/GTE discard + rv515 two sided stencil register. commit 755ae761c5519929a97567d61a379b87352c337c Merge: 4886b5b acd0c93 Author: Linus Torvalds Date: Mon Sep 7 11:41:15 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: IMA: update ima_counts_put commit 4886b5b485ec78fe4a16fedaccfab39bdf55410f Merge: cbeb286 d9d8e04 Author: Linus Torvalds Date: Mon Sep 7 11:40:24 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: gianfar: Fix build. commit cbeb2864b162f4298111196c8ce8ce492577cdee Merge: f69fb9c c9a2bfd Author: Linus Torvalds Date: Mon Sep 7 11:40:15 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: pcmcia: add CNF-CDROM-ID for ide commit f69fb9c39868463f6b0b8306824341bd5610250b Merge: e07cccf 07fb611 Author: Linus Torvalds Date: Mon Sep 7 11:38:30 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: agp/intel: support for new chip variant of IGDNG mobile drm/i915: Unref old_obj on get_fence_reg() error path drm/i915: increase default latency constant (v2 w/comment) commit a54775c8758a754186bc6adbfc518b1e9f8f1e4e Author: Dave Airlie Date: Mon Sep 7 15:26:19 2009 +1000 drm/radeon/kms: add LTE/GTE discard + rv515 two sided stencil register. This adds some rv350+ register for LTE/GTE discard, and enables the rv515 two sided stencil register. It also disables the DEPTHXY_OFFSET register which can be used to workaround the CS checker. Moves rs690 to proper place in rs600 and uses correct table on rs600. Signed-off-by: Dave Airlie commit acd0c935178649f72c44ec49ca83bee35ce1f79e Author: Mimi Zohar Date: Fri Sep 4 13:08:46 2009 -0400 IMA: update ima_counts_put - As ima_counts_put() may be called after the inode has been freed, verify that the inode is not NULL, before dereferencing it. - Maintain the IMA file counters in may_open() properly, decrementing any counter increments on subsequent errors. Reported-by: Ciprian Docan Reported-by: J.R. Okajima Signed-off-by: Mimi Zohar Acked-by: Eric Paris commit d9d8e0418ffd3d189345c435861e254c17ae06e5 Author: David S. Miller Date: Sun Sep 6 01:41:02 2009 -0700 gianfar: Fix build. Reported by Michael Guntsche -------------------- Commit 38bddf04bcfe661fbdab94888c3b72c32f6873b3 gianfar: gfar_remove needs to call unregister_netdev() breaks the build of the gianfar driver because "dev" is undefined in this function. To quickly test rc9 I changed this to priv->ndev but I do not know if this is the correct one. -------------------- Signed-off-by: David S. Miller commit 07fb6111e7af5fac6b6076e2658d0e32b67f713b Author: Zhenyu Wang Date: Thu Aug 13 18:57:29 2009 +0800 agp/intel: support for new chip variant of IGDNG mobile New variant of IGDNG mobile chip has new host bridge id. [anholt: Note that this new PCI ID doesn't impact the DRM, which doesn't care about the PCI ID of the bridge] Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit 58c2fb647a3cf70a90d7b33a3f2a8396a20a0bc4 Author: Chris Wilson Date: Tue Sep 1 12:02:39 2009 +0100 drm/i915: Unref old_obj on get_fence_reg() error path Remember to release the local reference if we fail to wait on the rendering. (Also whilst in the vicinity add some whitespace so that the phasing of the operations is clearer.) Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit bcc24fb42585dc9f490cf7789a917358414bdab5 Author: Jesse Barnes Date: Mon Aug 31 10:24:31 2009 -0700 drm/i915: increase default latency constant (v2 w/comment) Some i915/i945 platforms have a fairly high memory latency in certain situations, so increase our constant a bit to avoid FIFO underruns. The effect should be positive on other platforms as well; we'll have a bit more insurance against a busy memory subsystem due to the extra FIFO entries. Fixes fdo bug #23368. Needed for 2.6.31. Tested-by: Sven Arvidsson Tested-by: Chris Wilson Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt commit c9a2bfd1f08973115c2fc3da9372e0e81ac42a19 Author: Wolfram Sang Date: Fri Aug 14 13:09:32 2009 -0700 pcmcia: add CNF-CDROM-ID for ide Fixes this report: http://article.gmane.org/gmane.linux.kernel.pcmcia.devel/2228/ Reported-by: John McGrath Signed-off-by: Wolfram Sang Signed-off-by: David S. Miller