[nvidia-kmod/f24: 2/2] Merge branch 'master' into f24

[Leigh Scott]

commit 5f31d8d475a36dec73d46dc998027c7a1f7ea8ee
Merge: 6e118c4 9e3a705
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Jul 8 15:14:13 2016 +0100

    Merge branch 'master' into f24

 nv-linux-arm.patch  | 2 +-
 nv-linux-arm2.patch | 2 +-
 nvidia-kmod.spec    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
---