Merge commit '4414ceb126491c1abe47e693790eca5915a15fca' into merges
commitfd59fe118f48b73bbe6e71c60da537816fa4c5bc
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 18 Jul 2018 16:01:47 +0000 (18 12:01 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 18 Jul 2018 16:01:47 +0000 (18 12:01 -0400)
tree1ea26070ec46f5e86a384fbf6b511f64b0b74f5b
parentba14a2f882c1715fc868be6f8e89fef5e4ca3e82
parent4414ceb126491c1abe47e693790eca5915a15fca
Merge commit '4414ceb126491c1abe47e693790eca5915a15fca' into merges
arch/x86/kernel/platform/i86pc/io/todpc_subr.c
kernel/fs/xattr.c
kernel/fs/zfs/zfs_fm.c