| commit | 90520b78a4f8ba1faef75961eddd8192077e0ac2 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Thu Jan 07 13:36:00 2010 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Thu Jan 07 13:36:00 2010 +1000 |
| tree | 4179071189852a622d4a9e615a004388474069b5 | |
| parent | d94a5108f716bbd524358eb5a440d63991744a62 [diff] | |
| parent | e89a8c901ca94a47c0e0b2fb335623d810e37545 [diff] |
Merge branch 'drm-core-next' into drm-linus * drm-core-next: drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line() drm/edid: Fix CVT width/height decode drm/edid: Skip empty CVT codepoints drm: remove address mask param for drm_pci_alloc()