diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-19 11:07:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-19 11:07:14 +1000 |
| commit | 856ee92e8602bd86d34388ac08381c5cb3918756 (patch) | |
| tree | c3bed2bf85214f78239724adb34a1c2d6ec8444d /arch/x86/include/asm/intel-family.h | |
| parent | a6a5c983b35e579071370d4eb2b4ed8ad5c18da9 (diff) | |
| parent | 4f7d029b9bf009fbee76bb10c0c4351a1870d2f3 (diff) | |
Merge tag 'v4.11-rc7' into drm-next
Backmerge Linux 4.11-rc7 from Linus tree, to fix some
conflicts that were causing problems with the rerere cache
in drm-tip.
Diffstat (limited to 'arch/x86/include/asm/intel-family.h')
0 files changed, 0 insertions, 0 deletions