diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-07 18:37:01 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-07 18:37:01 -0400 |
| commit | d978a6361ad13f1f9694fcb7b5852d253a544d92 (patch) | |
| tree | 8e8a8c62286fab2c044c4b53563222c1b66d7cb0 /MAINTAINERS | |
| parent | 8303e699f7089a1cd1421750fb33f289e5f3e1b9 (diff) | |
| parent | cb28ea3b13b86fb23448525f34720e659bda7aa8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/nfc/microread/mei.c
net/netfilter/nfnetlink_queue_core.c
Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d3a888cfa0ea..c8f792ae9582 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6953,7 +6953,6 @@ F: drivers/scsi/st* | |||
| 6953 | 6953 | ||
| 6954 | SCTP PROTOCOL | 6954 | SCTP PROTOCOL |
| 6955 | M: Vlad Yasevich <vyasevich@gmail.com> | 6955 | M: Vlad Yasevich <vyasevich@gmail.com> |
| 6956 | M: Sridhar Samudrala <sri@us.ibm.com> | ||
| 6957 | M: Neil Horman <nhorman@tuxdriver.com> | 6956 | M: Neil Horman <nhorman@tuxdriver.com> |
| 6958 | L: linux-sctp@vger.kernel.org | 6957 | L: linux-sctp@vger.kernel.org |
| 6959 | W: http://lksctp.sourceforge.net | 6958 | W: http://lksctp.sourceforge.net |