Merge commit '44b94201113baeac54736e6ea488566d4a01ce48'
commitc9340b3cb5433e4f24953a7983e96ab3755e7424
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 11 Jul 2018 17:30:49 +0000 (11 13:30 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 11 Jul 2018 17:30:49 +0000 (11 13:30 -0400)
treed3f40a9fff90c5e200969ce93f492529f2ed37bc
parent6c3e9f87de94bc902cdbadbf16d3e2364ec7c123
parent44b94201113baeac54736e6ea488566d4a01ce48
Merge commit '44b94201113baeac54736e6ea488566d4a01ce48'
arch/x86/kernel/platform/i86pc/dboot/dboot_startkern.c
kernel/fs/zfs/spa_history.c
kernel/fs/zfs/zil.c