Merge tag 'hsi-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Oct 2016 01:51:59 +0000 (18:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Oct 2016 01:51:59 +0000 (18:51 -0700)
commit9a687aea2ffd8ab1e3c6239ea53c0a2209707bd5
tree86af40ae7fe57d58e5073374bdb13d6d0e9385e9
parent021723e6c5a5e7b50eb68f9812418406de9860b2
parent7ac5d7b1a1254ceb4be19ba93ef7a6ee4e7ac382
Merge tag 'hsi-for-4.9' of git://git./linux/kernel/git/sre/linux-hsi

Pull HSI fix from Sebastian Reichel:
 "Fix hsi userspace header"

* tag 'hsi-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: hsi_char.h: use __u32 from linux/types.h