From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Oct 2016 01:51:59 +0000 (-0700)
Subject: Merge tag 'hsi-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
X-Git-Tag: v4.9-rc1~99
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=9a687aea2ffd8ab1e3c6239ea53c0a2209707bd5

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

9a687aea2ffd8ab1e3c6239ea53c0a2209707bd5