diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-08 14:29:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-08 14:29:15 +1000 |
| commit | 7b0a9e8302522d5f7bb7fab6b8a3c8ce8181609c (patch) | |
| tree | c958236a2397b3e5be77d99a494673764341e737 /net/xfrm/xfrm_ipcomp.c | |
| parent | 3f838fc50c0dcdc993c24f6f5da0cda1228fc276 (diff) | |
| parent | d4877cf2293f5463f531769fd12300cb3417c778 (diff) | |
Merge remote branch 'korg/drm-radeon-dp' into drm-linus
This merges the radeon KMS DisplayPort and hotplug detect support.
Tested on RV635 DP card with a Dell 2408 monitor.
Conflicts:
drivers/gpu/drm/drm_fb_helper.c
Diffstat (limited to 'net/xfrm/xfrm_ipcomp.c')
0 files changed, 0 insertions, 0 deletions