diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-05 12:15:42 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-05 12:15:42 +1100 |
| commit | 20706db9172bf0fb9e016c40f006000631e514e1 (patch) | |
| tree | 6ca8564e3b9eb67aeb011e65581ecd44f9f01300 /MAINTAINERS | |
| parent | e5c9fd5b04ebf4e6f6ffca583030c91fb1d68a68 (diff) | |
| parent | 27000929ef0f137b34ba219eb04b05e772eff2b1 (diff) | |
Merge remote-tracking branch 'net-next/master'
Conflicts:
arch/mips/include/uapi/asm/socket.h
drivers/net/ethernet/intel/e1000e/ethtool.c
drivers/net/vmxnet3/vmxnet3_drv.c
drivers/net/wireless/iwlwifi/dvm/tx.c
net/ipv6/route.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 669881af977a..6cfe1db25a31 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3043,11 +3043,6 @@ S: Maintained F: include/linux/netfilter_bridge/ F: net/bridge/ -ETHERTEAM 16I DRIVER -M: Mika Kuoppala <miku@iki.fi> -S: Maintained -F: drivers/net/ethernet/fujitsu/eth16i.c - EXT2 FILE SYSTEM M: Jan Kara <jack@suse.cz> L: linux-ext4@vger.kernel.org @@ -5536,13 +5531,6 @@ F: include/linux/sunrpc/ F: include/uapi/linux/nfs* F: include/uapi/linux/sunrpc/ -NI5010 NETWORK DRIVER -M: Jan-Pascal van Best <janpascal@vanbest.org> -M: Andreas Mohr <andi@lisas.de> -L: netdev@vger.kernel.org -S: Maintained -F: drivers/net/ethernet/racal/ni5010.* - NILFS2 FILESYSTEM M: KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp> L: linux-nilfs@vger.kernel.org |