projects
/
linux
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
de61962
23ec9f5
)
Merge remote-tracking branch 'drm-intel/for-linux-next'
author
Stephen Rothwell
<sfr@canb.auug.org.au>
Fri, 8 Feb 2019 01:01:09 +0000
(12:01 +1100)
committer
Stephen Rothwell
<sfr@canb.auug.org.au>
Fri, 8 Feb 2019 01:01:09 +0000
(12:01 +1100)
1
2
drivers/gpu/drm/i915/i915_debugfs.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_gem.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_pci.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_pmu.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_pmu.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_display.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_dp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_drv.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_fbdev.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_overlay.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/gpu/drm/i915/i915_debugfs.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_drv.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_gem.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_pci.c
index
5d05572
,
36fa6f1
..
66f82f3
---
1
/
drivers/gpu/drm/i915/i915_pci.c
---
2
/
drivers/gpu/drm/i915/i915_pci.c
+++ b/
drivers/gpu/drm/i915/i915_pci.c
@@@
-26,8
-26,7
+26,9
@@@
#include <linux/vgaarb.h>
#include <linux/vga_switcheroo.h>
+#include <drm/drm_drv.h>
+
+ #include "i915_active.h"
#include "i915_drv.h"
#include "i915_selftest.h"
diff --cc
drivers/gpu/drm/i915/i915_pmu.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_pmu.h
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_display.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_dp.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_drv.h
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_fbdev.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_overlay.c
Simple merge