diff --git a/[refs] b/[refs] index 4643f9e2aba3..9726790eafe7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d4b3f08a80c90a4366e1b6d2e99b2b00d1871f2 +refs/heads/master: 40ad4a30299fd01ae2a7b3c76089e64517f05d3b diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 588bcc4ec2f2..b62367908111 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3758,6 +3758,12 @@ F: net/ieee802154/ F: net/mac802154/ F: drivers/ieee802154/ +IGUANAWORKS USB IR TRANSCEIVER +M: Sean Young +L: linux-media@vger.kernel.org +S: Maintained +F: drivers/media/rc/iguanair.c + IIO SUBSYSTEM AND DRIVERS M: Jonathan Cameron L: linux-iio@vger.kernel.org @@ -7321,6 +7327,12 @@ S: Supported F: drivers/net/team/ F: include/linux/if_team.h +TECHNOTREND USB IR RECEIVER +M: Sean Young +L: linux-media@vger.kernel.org +S: Maintained +F: drivers/media/rc/ttusbir.c + TEGRA SUPPORT M: Stephen Warren L: linux-tegra@vger.kernel.org