diff options
author | David S. Miller <davem@davemloft.net> | 2014-04-24 13:19:00 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-04-24 13:19:00 -0400 |
commit | 4366004d77278a90c18f92f7cb9ec0c264da563d (patch) | |
tree | 4fb046b6b06cc681f791a8ddf7507b5f8eb99be8 /MAINTAINERS | |
parent | e9f0fb88493570200b8dc1cc02d3e676412d25bc (diff) | |
parent | a450a685791d12c0a477b75d630d6ae66acab9a7 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/igb/e1000_mac.c
net/core/filter.c
Both conflicts were simple overlapping changes.
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 e67ea2442041..1241a73cc230 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -7674,7 +7674,6 @@ F: drivers/clk/samsung/ | |||
7674 | SAMSUNG SXGBE DRIVERS | 7674 | SAMSUNG SXGBE DRIVERS |
7675 | M: Byungho An <bh74.an@samsung.com> | 7675 | M: Byungho An <bh74.an@samsung.com> |
7676 | M: Girish K S <ks.giri@samsung.com> | 7676 | M: Girish K S <ks.giri@samsung.com> |
7677 | M: Siva Reddy Kallam <siva.kallam@samsung.com> | ||
7678 | M: Vipul Pandya <vipul.pandya@samsung.com> | 7677 | M: Vipul Pandya <vipul.pandya@samsung.com> |
7679 | S: Supported | 7678 | S: Supported |
7680 | L: netdev@vger.kernel.org | 7679 | L: netdev@vger.kernel.org |