diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-13 15:29:36 +1000 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-13 15:30:21 +1000 |
commit | 3a29dd6d6f445212ddbcf43a2ba6352127ce9ee8 (patch) | |
tree | e05aad022c46d0550f2c9dc8d4361a6634591852 /arch/powerpc/include/asm/iommu.h | |
parent | f7e9e358362557c3aa2c1ec47490f29fe880a09e (diff) | |
parent | 51925fb3c5c901aa06cdc853268a6e19e19bcdc7 (diff) | |
download | talos-op-linux-3a29dd6d6f445212ddbcf43a2ba6352127ce9ee8.tar.gz talos-op-linux-3a29dd6d6f445212ddbcf43a2ba6352127ce9ee8.zip |
Merge branch 'next-dlpar' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into next
Merge series from Nathan Fontenot to do memory hotplug in the kernel.
Diffstat (limited to 'arch/powerpc/include/asm/iommu.h')
0 files changed, 0 insertions, 0 deletions