diff options
author | Linus Torvalds | 2011-05-09 16:59:51 -0700 |
---|---|---|
committer | Linus Torvalds | 2011-05-09 16:59:51 -0700 |
commit | c191f6ccee11b79fb562c36007a5af31c705c9e2 (patch) | |
tree | c011a1212bfb8e8b043ef4acd253bd387c3efadb /mm/mmap.c | |
parent | a09a79f66874c905af35d5bb5e5f2fdc7b6b894d (diff) | |
parent | 2fb4e61d9471867677c97bf11dba8f1e9dfa7f7c (diff) |
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/lvds: Only act on lid notify when the device is on
drm/i915: fix intel_crtc_clock_get pipe reads after "cleanup cleanup"
drm/i915: Only enable the plane after setting the fb base (pre-ILK)
drm/i915/dp: Be paranoid in case we disable a DP before it is attached
drm/i915: Release object along create user fb error path
Diffstat (limited to 'mm/mmap.c')
0 files changed, 0 insertions, 0 deletions