diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-22 10:44:44 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-22 10:44:44 -0700 | 
| commit | 1f8b76656be831d1c6239bd36ef988d5b185b5ab (patch) | |
| tree | eaa065e07f76e58c2cb479724c3799f0ab3400ae /MAINTAINERS | |
| parent | 8351fcfe4f496f5f10f8ac340ddd8914eb04be7e (diff) | |
| parent | 30ca2226bea6f0db519dc53381b893cd66cb5b66 (diff) | |
| download | linux-1f8b76656be831d1c6239bd36ef988d5b185b5ab.tar.bz2 | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
 "A handful of fixes for 3.11 are still trickling in.  These are:
   - A couple of fixes for older OMAP platforms
   - Another few fixes for at91 (lateish due to European summer
     vacations)
   - A late-found problem with USB on Tegra, fix is to keep VBUS
     regulator on at all times
   - One fix for Exynos 5440 dealing with CPU detection
   - One MAINTAINERS update"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: tegra: always enable USB VBUS regulators
  ARM: davinci: nand: specify ecc strength
  ARM: OMAP: rx51: change musb mode to OTG
  ARM: OMAP2: fix musb usage for n8x0
  MAINTAINERS: Update email address for Benoit Cousson
  ARM: at91/DT: fix at91sam9n12ek memory node
  ARM: at91: add missing uart clocks DT entries
  ARM: SAMSUNG: fix to support for missing cpu specific map_io
  ARM: at91/DT: at91sam9x5ek: fix USB host property to enable port C
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 229c66b12cc2..8197fbd70a3e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5884,7 +5884,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 @@ -5964,14 +5964,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  |