diff options
| author | Linus Torvalds <[email protected]> | 2011-06-25 05:01:40 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-06-25 05:01:40 +0000 |
| commit | 536142f950f7ea4f3d146a138ad6938f28a34f33 (patch) | |
| tree | e17b6130a1df035e08f6c930fc31c24017bca9f4 /net/lapb/lapb_iface.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-block (diff) | |
| parent | drm/i915: save/resume forcewake lock fixes (diff) | |
| download | kernel-536142f950f7ea4f3d146a138ad6938f28a34f33.tar.gz kernel-536142f950f7ea4f3d146a138ad6938f28a34f33.zip | |
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
drm/i915: save/resume forcewake lock fixes
Revert "drm/i915: Kill GTT mappings when moving from GTT domain"
drm/i915: Apply HWSTAM workaround for BSD ring on SandyBridge
drm/i915: Call intel_enable_plane from i9xx_crtc_mode_set (again)
Diffstat (limited to 'net/lapb/lapb_iface.c')
0 files changed, 0 insertions, 0 deletions