diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2014-06-17 14:36:41 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2014-06-17 14:37:31 +0200 |
| commit | f0b1f6442b5090fed3529cb39f3acf8c91693d3d (patch) | |
| tree | bc5f62b017a82161c9a7f892f464813f6efd5bf3 /MAINTAINERS | |
| parent | 4632a93f015caf6d7db4352f37aab74a39e60d7a (diff) | |
| parent | 7171511eaec5bf23fb06078f59784a3a0626b38f (diff) | |
| download | op-kernel-dev-f0b1f6442b5090fed3529cb39f3acf8c91693d3d.zip op-kernel-dev-f0b1f6442b5090fed3529cb39f3acf8c91693d3d.tar.gz | |
Merge tag 'v3.16-rc1' into i2c/for-next
Merge a stable base (Linux 3.16-rc1)
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b4a66b9..134483f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -604,6 +604,13 @@ L: amd64-microcode@amd64.org S: Maintained F: arch/x86/kernel/microcode_amd.c +AMD XGBE DRIVER +M: Tom Lendacky <thomas.lendacky@amd.com> +L: netdev@vger.kernel.org +S: Supported +F: drivers/net/ethernet/amd/xgbe/ +F: drivers/net/phy/amd-xgbe-phy.c + AMS (Apple Motion Sensor) DRIVER M: Michael Hanselmann <linux-kernel@hansmi.ch> S: Supported @@ -1894,7 +1901,7 @@ F: drivers/net/ethernet/broadcom/bnx2.* F: drivers/net/ethernet/broadcom/bnx2_* BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER -M: Ariel Elior <ariele@broadcom.com> +M: Ariel Elior <ariel.elior@qlogic.com> L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/broadcom/bnx2x/ @@ -1974,6 +1981,12 @@ S: Maintained F: drivers/bcma/ F: include/linux/bcma/ +BROADCOM SYSTEMPORT ETHERNET DRIVER +M: Florian Fainelli <f.fainelli@gmail.com> +L: netdev@vger.kernel.org +S: Supported +F: drivers/net/ethernet/broadcom/bcmsysport.* + BROCADE BFA FC SCSI DRIVER M: Anil Gurumurthy <anil.gurumurthy@qlogic.com> M: Sudarsana Kalluru <sudarsana.kalluru@qlogic.com> @@ -2230,9 +2243,8 @@ F: drivers/platform/chrome/ CISCO VIC ETHERNET NIC DRIVER M: Christian Benvenuti <benve@cisco.com> M: Sujith Sankar <ssujith@cisco.com> -M: Govindarajulu Varadarajan <govindarajulu90@gmail.com> +M: Govindarajulu Varadarajan <_govind@gmx.com> M: Neel Patel <neepatel@cisco.com> -M: Nishank Trivedi <nistrive@cisco.com> S: Supported F: drivers/net/ethernet/cisco/enic/ @@ -2582,7 +2594,7 @@ S: Supported F: drivers/infiniband/hw/cxgb3/ CXGB4 ETHERNET DRIVER (CXGB4) -M: Dimitris Michailidis <dm@chelsio.com> +M: Hariprasad S <hariprasad@chelsio.com> L: netdev@vger.kernel.org W: http://www.chelsio.com S: Supported @@ -2952,6 +2964,7 @@ L: dri-devel@lists.freedesktop.org T: git git://people.freedesktop.org/~airlied/linux S: Maintained F: drivers/gpu/drm/ +F: drivers/gpu/vga/ F: include/drm/ F: include/uapi/drm/ @@ -6167,6 +6180,7 @@ F: include/uapi/linux/netdevice.h F: tools/net/ F: tools/testing/selftests/net/ F: lib/random32.c +F: lib/test_bpf.c NETWORKING [IPv4/IPv6] M: "David S. Miller" <davem@davemloft.net> |
