diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-06 13:01:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-06 13:01:39 -0800 |
| commit | f6510ec5a96d07897a109ad8919c6af5e9b3f4bc (patch) | |
| tree | e882156ce1135a63310cff4d4c0a7a799c07c9a6 /drivers/net/3c505.c | |
| parent | 6f5a55f1a6c5abee15a0e878e5c74d9f1569b8b0 (diff) | |
| parent | 93533c291a0af78ca57115fc44d2e6c4c9517cd2 (diff) | |
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:
drm/i915: Fix leak of relocs along do_execbuffer error path
drm/i915: slow acpi_lid_open() causes flickering - V2
drm/i915: Disable SR when more than one pipe is enabled
drm/i915: page flip support for Ironlake
drm/i915: Fix the incorrect DMI string for Samsung SX20S laptop
drm/i915: Add support for SDVO composite TV
drm/i915: don't trigger ironlake vblank interrupt at irq install
drm/i915: handle non-flip pending case when unpinning the scanout buffer
drm/i915: Fix the device info of Pineview
drm/i915: enable vblank interrupt on ironlake
drm/i915: Prevent use of uninitialized pointers along error path.
drm/i915: disable hotplug detect before Ironlake CRT detect
Diffstat (limited to 'drivers/net/3c505.c')
0 files changed, 0 insertions, 0 deletions