diff options
| author |   Felipe Balbi <balbi@ti.com> | 2014-09-16 09:53:59 -0500 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-09-16 09:53:59 -0500 |
| commit | 4cd41ffd27b6b775445ecfdb72b592b71d6b4a32 (patch) | |
| tree | 61e8c51ed5b9fae163d2d54967ebda02805c0bfa /MAINTAINERS | |
| parent | usb: dwc3: Add Qualcomm DWC3 glue layer driver (diff) | |
| parent | Linux 3.17-rc5 (diff) | |
| download | linux-dev-4cd41ffd27b6b775445ecfdb72b592b71d6b4a32.tar.xz linux-dev-4cd41ffd27b6b775445ecfdb72b592b71d6b4a32.zip | |
Merge tag 'v3.17-rc5' into next
Linux 3.17-rc5
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
Documentation/devicetree/bindings/usb/mxs-phy.txt
drivers/usb/phy/phy-mxs-usb.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 96568a8f961b..3ca017a3ddea 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6425,7 +6425,8 @@ F: Documentation/scsi/NinjaSCSI.txt F: drivers/scsi/nsp32* NTB DRIVER -M: Jon Mason <jon.mason@intel.com> +M: Jon Mason <jdmason@kudzu.us> +M: Dave Jiang <dave.jiang@intel.com> S: Supported W: https://github.com/jonmason/ntb/wiki T: git git://github.com/jonmason/ntb.git @@ -7054,7 +7055,7 @@ S: Maintained F: drivers/pinctrl/sh-pfc/ PIN CONTROLLER - SAMSUNG -M: Tomasz Figa <t.figa@samsung.com> +M: Tomasz Figa <tomasz.figa@gmail.com> M: Thomas Abraham <thomas.abraham@linaro.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) @@ -7900,7 +7901,8 @@ S: Supported F: drivers/media/i2c/s5k5baf.c SAMSUNG SOC CLOCK DRIVERS -M: Tomasz Figa <t.figa@samsung.com> +M: Sylwester Nawrocki <s.nawrocki@samsung.com> +M: Tomasz Figa <tomasz.figa@gmail.com> S: Supported L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) F: drivers/clk/samsung/ @@ -7913,6 +7915,19 @@ S: Supported L: netdev@vger.kernel.org F: drivers/net/ethernet/samsung/sxgbe/ +SAMSUNG USB2 PHY DRIVER +M: Kamil Debski <k.debski@samsung.com> +L: linux-kernel@vger.kernel.org +S: Supported +F: Documentation/devicetree/bindings/phy/samsung-phy.txt +F: Documentation/phy/samsung-usb2.txt +F: drivers/phy/phy-exynos4210-usb2.c +F: drivers/phy/phy-exynos4x12-usb2.c +F: drivers/phy/phy-exynos5250-usb2.c +F: drivers/phy/phy-s5pv210-usb2.c +F: drivers/phy/phy-samsung-usb2.c +F: drivers/phy/phy-samsung-usb2.h + SERIAL DRIVERS M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> L: linux-serial@vger.kernel.org |