diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-28 17:21:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-28 17:21:20 -0700 |
| commit | 56a50adda49b2020156616c4eb15353e0f9ad7de (patch) | |
| tree | a0453fde37538653628270258c3291d880a66853 /drivers/net/Makefile | |
| parent | c2e2ceeae4b5587d412c05cdc31513179d37811d (diff) | |
| parent | 355d7f370b51bbb6f31aaf9f98861057e1e6bbb2 (diff) | |
Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
* 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
drm/i915: fix up error path leak in i915_cmdbuffer
drm/i915: fix unpaired i915 device mutex on entervt failure.
drm/i915: add support for G41 chipset
drm/i915: Enable ASLE if present
drm/i915: Unregister ACPI video driver when exiting
drm/i915: Register ACPI video even when not modesetting
drm/i915: fix transition to I915_TILING_NONE
drm/i915: Don't let an oops get triggered from irq_emit without dma init.
drm/i915: allow tiled front buffers on 965+
Diffstat (limited to 'drivers/net/Makefile')
0 files changed, 0 insertions, 0 deletions