diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-19 18:53:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-19 18:53:20 -0700 |
| commit | d90125bfe958ed0451c6b98f831c86aba08b43d5 (patch) | |
| tree | 3a9ea24091f958a92e1d0d12f5135e50adf71b31 /net/ipv4/netfilter/ip_conntrack_proto_icmp.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart (diff) | |
| parent | intelfb: fixup clock calculation debugging. (diff) | |
| download | linux-dev-d90125bfe958ed0451c6b98f831c86aba08b43d5.tar.xz linux-dev-d90125bfe958ed0451c6b98f831c86aba08b43d5.zip | |
Merge branch 'i915fb' of git://git.kernel.org/pub/scm/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
...
Diffstat (limited to 'net/ipv4/netfilter/ip_conntrack_proto_icmp.c')
0 files changed, 0 insertions, 0 deletions