diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-29 18:48:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-29 18:48:54 -0400 |
| commit | 64c27237a07129758e33f5f824ba5c33b7f57417 (patch) | |
| tree | 4c0c0a9b6d282d600f2226e1b3510096b9d789dd /MAINTAINERS | |
| parent | 77a9939426f7a3f35f460afc9b11f1fe45955409 (diff) | |
| parent | 49d8137a4039c63c834827f4bfe875e27bb9c521 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/marvell/mvneta.c
The mvneta.c conflict is a case of overlapping changes,
a conversion to devm_ioremap_resource() vs. a conversion
to netdev_alloc_pcpu_stats.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f779c91122b..162b0fe3b00 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1839,8 +1839,8 @@ F: net/bluetooth/ F: include/net/bluetooth/ BONDING DRIVER -M: Jay Vosburgh <fubar@us.ibm.com> -M: Veaceslav Falico <vfalico@redhat.com> +M: Jay Vosburgh <j.vosburgh@gmail.com> +M: Veaceslav Falico <vfalico@gmail.com> M: Andy Gospodarek <andy@greyhouse.net> L: netdev@vger.kernel.org W: http://sourceforge.net/projects/bonding/ @@ -6019,6 +6019,7 @@ F: include/uapi/linux/net.h F: include/uapi/linux/netdevice.h F: tools/net/ F: tools/testing/selftests/net/ +F: lib/random32.c NETWORKING [IPv4/IPv6] M: "David S. Miller" <davem@davemloft.net> |