]> git.ipfire.org Git - people/ms/linux.git/commitdiff
projects / people / ms / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92cffd5 2497ee7)
Merge tag 'drm-amdkfd-next-fixes-2015-08-30' of git://people.freedesktop.org/~gabbayo...
authorDave Airlie <airlied@redhat.com>
Mon, 31 Aug 2015 00:05:37 +0000 (10:05 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 31 Aug 2015 00:05:37 +0000 (10:05 +1000)
Just one small fix before 4.3 merge window:

- Use linux/mman.h instead of uapi's mman-common.h inside the driver.

* tag 'drm-amdkfd-next-fixes-2015-08-30' of git://people.freedesktop.org/~gabbayo/linux:
  amdkfd: use <linux/mman.h> instead of <uapi/asm-generic/mman-common.h>


Trivial merge
Michael's Linux tree.