diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-22 13:44:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-22 13:44:44 -0400 |
commit | 1f8b76656be831d1c6239bd36ef988d5b185b5ab (patch) | |
tree | eaa065e07f76e58c2cb479724c3799f0ab3400ae /MAINTAINERS | |
parent | 8351fcfe4f496f5f10f8ac340ddd8914eb04be7e (diff) | |
parent | 30ca2226bea6f0db519dc53381b893cd66cb5b66 (diff) |
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 | |||
5884 | F: include/linux/i2c-omap.h | 5884 | F: include/linux/i2c-omap.h |
5885 | 5885 | ||
5886 | OMAP DEVICE TREE SUPPORT | 5886 | OMAP DEVICE TREE SUPPORT |
5887 | M: Benoît Cousson <b-cousson@ti.com> | 5887 | M: Benoît Cousson <bcousson@baylibre.com> |
5888 | M: Tony Lindgren <tony@atomide.com> | 5888 | M: Tony Lindgren <tony@atomide.com> |
5889 | L: linux-omap@vger.kernel.org | 5889 | L: linux-omap@vger.kernel.org |
5890 | L: devicetree@vger.kernel.org | 5890 | L: devicetree@vger.kernel.org |
@@ -5964,14 +5964,14 @@ S: Maintained | |||
5964 | F: drivers/char/hw_random/omap-rng.c | 5964 | F: drivers/char/hw_random/omap-rng.c |
5965 | 5965 | ||
5966 | OMAP HWMOD SUPPORT | 5966 | OMAP HWMOD SUPPORT |
5967 | M: Benoît Cousson <b-cousson@ti.com> | 5967 | M: Benoît Cousson <bcousson@baylibre.com> |
5968 | M: Paul Walmsley <paul@pwsan.com> | 5968 | M: Paul Walmsley <paul@pwsan.com> |
5969 | L: linux-omap@vger.kernel.org | 5969 | L: linux-omap@vger.kernel.org |
5970 | S: Maintained | 5970 | S: Maintained |
5971 | F: arch/arm/mach-omap2/omap_hwmod.* | 5971 | F: arch/arm/mach-omap2/omap_hwmod.* |
5972 | 5972 | ||
5973 | OMAP HWMOD DATA FOR OMAP4-BASED DEVICES | 5973 | OMAP HWMOD DATA FOR OMAP4-BASED DEVICES |
5974 | M: Benoît Cousson <b-cousson@ti.com> | 5974 | M: Benoît Cousson <bcousson@baylibre.com> |
5975 | L: linux-omap@vger.kernel.org | 5975 | L: linux-omap@vger.kernel.org |
5976 | S: Maintained | 5976 | S: Maintained |
5977 | F: arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 5977 | F: arch/arm/mach-omap2/omap_hwmod_44xx_data.c |