diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-27 17:14:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-27 17:14:32 -0700 |
| commit | 5cefb4ee245cb28a3920dbd0edc9d6df1f72a8cf (patch) | |
| tree | 30f02544d759f49b4d498370a7492a2f9920b1ce /net/lapb/lapb_timer.c | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma (diff) | |
| parent | efi/libstub/arm: Don't randomize runtime regions when CONFIG_HIBERNATION=y (diff) | |
| download | linux-dev-5cefb4ee245cb28a3920dbd0edc9d6df1f72a8cf.tar.xz linux-dev-5cefb4ee245cb28a3920dbd0edc9d6df1f72a8cf.zip | |
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fixes from Ingo Molnar:
"Two fixes: an ARM fix for KASLR interaction with hibernation, plus an
efi_test crash fix"
* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi/libstub/arm: Don't randomize runtime regions when CONFIG_HIBERNATION=y
efi/efi_test: Prevent an Oops in efi_runtime_query_capsulecaps()
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions