Merge tag 'drm-amdkfd-next-2016-05-04' of git://people.freedesktop.org/~gabbayo/linux...
authorDave Airlie <airlied@redhat.com>
Wed, 4 May 2016 07:43:23 +0000 (17:43 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 4 May 2016 07:43:23 +0000 (17:43 +1000)
commit090e1a7f5ce139ab4246fcaafaac0415008b7dfa
treefb20fd199b2786852ebd74ee50b64358bb646917
parent84c8a2de49560a65f10ec975b3281303a5ef0533
parenteb026024c24bbeb18e08d973e950f76c0d97a3c0
Merge tag 'drm-amdkfd-next-2016-05-04' of git://people.freedesktop.org/~gabbayo/linux into drm-next

Here are a few amdkfd patches for 4.7, all of them fixes according to
the Coccinelle tool.

* tag 'drm-amdkfd-next-2016-05-04' of git://people.freedesktop.org/~gabbayo/linux:
  amdkfd: Trim unnescessary intermediate err var in kfd_chardev.c
  amdkfd: Trim off unnescessary semicolon from kfd_packet_manager.c
  amdkfd: Use the canonical form in branch predicates