| commit | 2bd34f6ca86b5a5f9b749624f73310820e7a93fd | [log] [tgz] |
|---|---|---|
| author | Eric Anholt <eric@anholt.net> | Sun Aug 01 19:23:53 2010 -0700 |
| committer | Eric Anholt <eric@anholt.net> | Sun Aug 01 19:34:47 2010 -0700 |
| tree | 9e42100423e78f400412dfa974a6a13bac94d2c0 | |
| parent | a2757b6fab6dee3dbf43bdb7d7226d03747fbdb1 [diff] | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 [diff] |
Merge remote branch 'origin/master' into drm-intel-next This resolves the conflict in the EDP code, which has been rather popular to hack on recently. Conflicts: drivers/gpu/drm/i915/intel_dp.c