]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7377c22 b22c43e)
Merge branch topic/uek-4.1/secureboot of git://ca-git.us.oracle.com/linux-uek into...
authorChuck Anderson <chuck.anderson@oracle.com>
Wed, 16 Nov 2016 20:38:22 +0000 (12:38 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Wed, 16 Nov 2016 20:38:22 +0000 (12:38 -0800)
* topic/uek-4.1/secureboot:
  acpi: Disable ACPI table override if securelevel is set

1  2 
arch/x86/kernel/setup.c patch | diff1 | diff2 | blob | history
drivers/acpi/osl.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/setup.c
Simple merge
diff --cc drivers/acpi/osl.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.