diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-25 11:07:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-25 11:07:13 +0200 |
| commit | 3a9ff4fd04cc6ad199419508c8ea6eb839e0262d (patch) | |
| tree | f3933b082ea1743e63e93a16190c6ce32175c96a /MAINTAINERS | |
| parent | 9c8783201cb58e9af8ddeb0cc68f37b0a44ca16c (diff) | |
| parent | 90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 (diff) | |
| download | linux-3a9ff4fd04cc6ad199419508c8ea6eb839e0262d.tar.bz2 | |
Merge branch 'linus' into sched/core, to pick up fixes
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 84d6a8277cbd..1c3feffb1c1c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7110,7 +7110,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/ @@ -14004,6 +14003,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> |