]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
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 Mar 2016 18:18:47 +0000 (11:18 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Wed, 16 Mar 2016 18:18:47 +0000 (11:18 -0700)
1  2 
arch/x86/kernel/setup.c
arch/x86/platform/efi/efi.c
init/main.c

Simple merge
Simple merge
diff --cc init/main.c
Simple merge