From: Linus Torvalds Date: Tue, 20 Jun 2006 01:53:20 +0000 (-0700) Subject: Merge branch 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelf... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d90125bfe958ed0451c6b98f831c86aba08b43d5;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'i915fb' of git://git./linux/kernel/git/airlied/intelfb-2.6 * 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6: (25 commits) intelfb: fixup clock calculation debugging. Removed hard coded EDID buffer size. intelfb: use regular modedb table instead of VESA intelfb: use firmware EDID for mode database Revert "intelfb driver -- use the regular modedb table instead of the VESA" intelfb: int option fix sync modesetting code with X.org intelfb: align with changes from my X driver. intelfb driver -- use the regular modedb table instead of the VESA Adds support for 256MB aperture on 945 chipsets to the intelfb driver intelfb -- uses stride alignment of 64 on the 9xx chipsets. intelfb: some cleanups for intelfbhw intelfb: fixup pitch calculation like X does intelfb: fixup p calculation This patch makes a needlessly global struct static. intelfb: add i945GM support intelfb: fixup whitespace.. intelfb: add hw cursor support for i9xx intelfb: make i915 modeset intelfb: add support for i945G ... --- d90125bfe958ed0451c6b98f831c86aba08b43d5