diff options
| author | Eric Anholt <eric@anholt.net> | 2010-08-01 22:23:53 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-08-01 22:34:47 -0400 |
| commit | 2bd34f6ca86b5a5f9b749624f73310820e7a93fd (patch) | |
| tree | 9e42100423e78f400412dfa974a6a13bac94d2c0 /arch/mips/kernel/vmlinux.lds.S | |
| 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
Diffstat (limited to 'arch/mips/kernel/vmlinux.lds.S')
0 files changed, 0 insertions, 0 deletions