diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-30 14:04:14 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-30 14:04:14 +0400 |
| commit | c79c33af8f867e57ad4b84102db7901aee67485a (patch) | |
| tree | aa619736b89a143cfc48f9647493c929523a928a /MAINTAINERS | |
| parent | 1c9a341bbdc14051a4d8c74ea67269786c7d3736 (diff) | |
| parent | 824ef826f3c4d83d1925a5e351313bfd3e5ca6cb (diff) | |
| download | linux-c79c33af8f867e57ad4b84102db7901aee67485a.tar.xz | |
Merge remote-tracking branch 'asoc/topic/core' into tmp
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1486c5dfbf08..ee738a6bfc32 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5885,7 +5885,7 @@ F: drivers/i2c/busses/i2c-omap.c F: include/linux/i2c-omap.h OMAP DEVICE TREE SUPPORT -M: Benoît Cousson <b-cousson@ti.com> +M: Benoît Cousson <bcousson@baylibre.com> M: Tony Lindgren <tony@atomide.com> L: linux-omap@vger.kernel.org L: devicetree@vger.kernel.org @@ -5965,14 +5965,14 @@ S: Maintained F: drivers/char/hw_random/omap-rng.c OMAP HWMOD SUPPORT -M: Benoît Cousson <b-cousson@ti.com> +M: Benoît Cousson <bcousson@baylibre.com> M: Paul Walmsley <paul@pwsan.com> L: linux-omap@vger.kernel.org S: Maintained F: arch/arm/mach-omap2/omap_hwmod.* OMAP HWMOD DATA FOR OMAP4-BASED DEVICES -M: Benoît Cousson <b-cousson@ti.com> +M: Benoît Cousson <bcousson@baylibre.com> L: linux-omap@vger.kernel.org S: Maintained F: arch/arm/mach-omap2/omap_hwmod_44xx_data.c |