From: Dave Airlie <airlied@redhat.com>
Date: Mon, 31 Aug 2015 00:05:37 +0000 (+1000)
Subject: Merge tag 'drm-amdkfd-next-fixes-2015-08-30' of git://people.freedesktop.org/~gabbayo... 
X-Git-Tag: firefly_0821_release~176^2~1083^2~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d3e8ea50922d90aea473474bdcede34ce743e1a5;p=firefly-linux-kernel-4.4.55.git

Merge tag 'drm-amdkfd-next-fixes-2015-08-30' of git://people.freedesktop.org/~gabbayo/linux into drm-next

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>
---

d3e8ea50922d90aea473474bdcede34ce743e1a5