aboutsummaryrefslogtreecommitdiff
path: root/fs/dlm/main.c
diff options
context:
space:
mode:
authorDave Airlie2015-05-29 09:05:53 +1000
committerDave Airlie2015-05-29 09:05:53 +1000
commitd641958f658833b5866ea80861f9ff8eb1519bec (patch)
tree893575c1ff8b6d0ec42f01404337c04e9044aa0f /fs/dlm/main.c
parent97758ff7c8f93ea0ed43eb7aef6c942f667372a0 (diff)
parent7c0411d2fabc2e2702c9871ffb603e251158b317 (diff)
Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
one more regression fix, partial revert. * 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux: drm/radeon: partially revert "fix VM_CONTEXT*_PAGE_TABLE_END_ADDR handling"
Diffstat (limited to 'fs/dlm/main.c')
0 files changed, 0 insertions, 0 deletions