diff options
author | David S. Miller <davem@davemloft.net> | 2014-05-12 13:19:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-12 13:19:14 -0400 |
commit | 5f013c9bc70214dcacd5fbed5a06c217d6ff9c59 (patch) | |
tree | 34c3a633000e03bca57d0ce55d8759f86edecc03 /MAINTAINERS | |
parent | 51ee42efa0829cf9e46f8e1c0ab7a9ab6facf3f2 (diff) | |
parent | 1a466ae96e9f749d02a73315a3e66375e61a61dd (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/altera/altera_sgdma.c
net/netlink/af_netlink.c
net/sched/cls_api.c
net/sched/sch_api.c
The netlink conflict dealt with moving to netlink_capable() and
netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations
in non-init namespaces. These were simple transformations from
netlink_capable to netlink_ns_capable.
The Altera driver conflict was simply code removal overlapping some
void pointer cast cleanups in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7bb7eadd078c..bde15ffcccf9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3491,6 +3491,12 @@ S: Maintained | |||
3491 | F: drivers/extcon/ | 3491 | F: drivers/extcon/ |
3492 | F: Documentation/extcon/ | 3492 | F: Documentation/extcon/ |
3493 | 3493 | ||
3494 | EXYNOS DP DRIVER | ||
3495 | M: Jingoo Han <jg1.han@samsung.com> | ||
3496 | L: dri-devel@lists.freedesktop.org | ||
3497 | S: Maintained | ||
3498 | F: drivers/gpu/drm/exynos/exynos_dp* | ||
3499 | |||
3494 | EXYNOS MIPI DISPLAY DRIVERS | 3500 | EXYNOS MIPI DISPLAY DRIVERS |
3495 | M: Inki Dae <inki.dae@samsung.com> | 3501 | M: Inki Dae <inki.dae@samsung.com> |
3496 | M: Donghwa Lee <dh09.lee@samsung.com> | 3502 | M: Donghwa Lee <dh09.lee@samsung.com> |
@@ -3556,7 +3562,7 @@ F: include/scsi/libfcoe.h | |||
3556 | F: include/uapi/scsi/fc/ | 3562 | F: include/uapi/scsi/fc/ |
3557 | 3563 | ||
3558 | FILE LOCKING (flock() and fcntl()/lockf()) | 3564 | FILE LOCKING (flock() and fcntl()/lockf()) |
3559 | M: Jeff Layton <jlayton@redhat.com> | 3565 | M: Jeff Layton <jlayton@poochiereds.net> |
3560 | M: J. Bruce Fields <bfields@fieldses.org> | 3566 | M: J. Bruce Fields <bfields@fieldses.org> |
3561 | L: linux-fsdevel@vger.kernel.org | 3567 | L: linux-fsdevel@vger.kernel.org |
3562 | S: Maintained | 3568 | S: Maintained |
@@ -5114,14 +5120,19 @@ F: drivers/s390/kvm/ | |||
5114 | 5120 | ||
5115 | KERNEL VIRTUAL MACHINE (KVM) FOR ARM | 5121 | KERNEL VIRTUAL MACHINE (KVM) FOR ARM |
5116 | M: Christoffer Dall <christoffer.dall@linaro.org> | 5122 | M: Christoffer Dall <christoffer.dall@linaro.org> |
5123 | M: Marc Zyngier <marc.zyngier@arm.com> | ||
5124 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
5117 | L: kvmarm@lists.cs.columbia.edu | 5125 | L: kvmarm@lists.cs.columbia.edu |
5118 | W: http://systems.cs.columbia.edu/projects/kvm-arm | 5126 | W: http://systems.cs.columbia.edu/projects/kvm-arm |
5119 | S: Supported | 5127 | S: Supported |
5120 | F: arch/arm/include/uapi/asm/kvm* | 5128 | F: arch/arm/include/uapi/asm/kvm* |
5121 | F: arch/arm/include/asm/kvm* | 5129 | F: arch/arm/include/asm/kvm* |
5122 | F: arch/arm/kvm/ | 5130 | F: arch/arm/kvm/ |
5131 | F: virt/kvm/arm/ | ||
5132 | F: include/kvm/arm_* | ||
5123 | 5133 | ||
5124 | KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64) | 5134 | KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64) |
5135 | M: Christoffer Dall <christoffer.dall@linaro.org> | ||
5125 | M: Marc Zyngier <marc.zyngier@arm.com> | 5136 | M: Marc Zyngier <marc.zyngier@arm.com> |
5126 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 5137 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
5127 | L: kvmarm@lists.cs.columbia.edu | 5138 | L: kvmarm@lists.cs.columbia.edu |
@@ -7283,7 +7294,6 @@ F: drivers/video/aty/aty128fb.c | |||
7283 | RALINK RT2X00 WIRELESS LAN DRIVER | 7294 | RALINK RT2X00 WIRELESS LAN DRIVER |
7284 | P: rt2x00 project | 7295 | P: rt2x00 project |
7285 | M: Ivo van Doorn <IvDoorn@gmail.com> | 7296 | M: Ivo van Doorn <IvDoorn@gmail.com> |
7286 | M: Gertjan van Wingerde <gwingerde@gmail.com> | ||
7287 | M: Helmut Schaa <helmut.schaa@googlemail.com> | 7297 | M: Helmut Schaa <helmut.schaa@googlemail.com> |
7288 | L: linux-wireless@vger.kernel.org | 7298 | L: linux-wireless@vger.kernel.org |
7289 | L: users@rt2x00.serialmonkey.com (moderated for non-subscribers) | 7299 | L: users@rt2x00.serialmonkey.com (moderated for non-subscribers) |
@@ -7299,7 +7309,7 @@ F: Documentation/blockdev/ramdisk.txt | |||
7299 | F: drivers/block/brd.c | 7309 | F: drivers/block/brd.c |
7300 | 7310 | ||
7301 | RANDOM NUMBER DRIVER | 7311 | RANDOM NUMBER DRIVER |
7302 | M: Theodore Ts'o" <tytso@mit.edu> | 7312 | M: "Theodore Ts'o" <tytso@mit.edu> |
7303 | S: Maintained | 7313 | S: Maintained |
7304 | F: drivers/char/random.c | 7314 | F: drivers/char/random.c |
7305 | 7315 | ||