summaryrefslogtreecommitdiff
path: root/include/linux/securebits.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-06-02 17:49:10 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-06-02 17:49:10 -0700
commiteadcbfa58ae8693f0d6a0f591d8f51d55cf068e1 (patch)
treecff3f1c56a8bf15138b652ee9dab50dddd6edee5 /include/linux/securebits.h
parentc4beedb8a914af9c8c1b6e67c753adf411e05160 (diff)
parent5ed02dbb497422bf225783f46e6eadd237d23d6b (diff)
downloadlinux-eadcbfa58ae8693f0d6a0f591d8f51d55cf068e1.tar.gz
linux-eadcbfa58ae8693f0d6a0f591d8f51d55cf068e1.tar.xz
Merge tag 'v4.12-rc3' into for-linus
Merge with mainline to get acpi_dev_present() needed by patches to axp20x-pek driver.
Diffstat (limited to 'include/linux/securebits.h')
0 files changed, 0 insertions, 0 deletions