diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-08-31 14:20:06 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-08-31 14:20:06 +0200 |
commit | 3e83dfd5d8e374328078f527f1f7d189824896ab (patch) | |
tree | 2f82b2e82f7a4b5c513fed42d4228a8bce938180 /MAINTAINERS | |
parent | 3308376a914b9c3f57a12072c063814403d983a8 (diff) | |
parent | 9e52fc2b50de3a1c08b44f94c610fbe998c0031a (diff) | |
download | lwn-3e83dfd5d8e374328078f527f1f7d189824896ab.tar.gz lwn-3e83dfd5d8e374328078f527f1f7d189824896ab.zip |
Merge branch 'x86/mm' into x86/platform, to pick up TLB flush dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e99c74812f8d..b3eadf39ecf4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7111,7 +7111,6 @@ M: Marc Zyngier <marc.zyngier@arm.com> L: linux-kernel@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core -T: git git://git.infradead.org/users/jcooper/linux.git irqchip/core F: Documentation/devicetree/bindings/interrupt-controller/ F: drivers/irqchip/ @@ -14005,6 +14004,7 @@ F: drivers/block/virtio_blk.c F: include/linux/virtio*.h F: include/uapi/linux/virtio_*.h F: drivers/crypto/virtio/ +F: mm/balloon_compaction.c VIRTIO CRYPTO DRIVER M: Gonglei <arei.gonglei@huawei.com> |