]> 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: e28b6ef a22fa88)
Merge branch 'topic/uek-4.1/secureboot' of git://ca-git.us.oracle.com/linux-uek into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Mon, 14 Dec 2015 23:24:08 +0000 (15:24 -0800)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Mon, 14 Dec 2015 23:24:08 +0000 (15:24 -0800)
* 'topic/uek-4.1/secureboot' of git://ca-git.us.oracle.com/linux-uek:
  x86/efi: back-out bug fix 22353360 which causes efi regression

1  2 
arch/x86/platform/efi/efi.c patch | diff1 | diff2 | blob | history
init/main.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/platform/efi/efi.c
Simple merge
diff --cc init/main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.