summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-07-26 17:54:21 +0200
committerArnd Bergmann <arnd@arndb.de>2014-07-26 17:54:21 +0200
commit944483d0330bb497549977aa9649be6b7d0ede37 (patch)
tree545d9c5498e0dbe7697b36ad50379a815b48ec1b /MAINTAINERS
parent03eea7cda20128f97fa281650ada69fe19194d56 (diff)
parentfd9f5edf6e7e8a666f3672fd809f3289c2da388a (diff)
downloadblackbird-op-linux-944483d0330bb497549977aa9649be6b7d0ede37.tar.gz
blackbird-op-linux-944483d0330bb497549977aa9649be6b7d0ede37.zip
Merge branch 'next/fixes-non-critical' into next/soc
This resolves a nontrivial conflict against a bug fix in another branch. Conflicts: arch/arm/mach-exynos/pm.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 16458d98594f..fb784e03db0d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1364,6 +1364,7 @@ F: drivers/pinctrl/pinctrl-st.c
F: drivers/media/rc/st_rc.c
F: drivers/i2c/busses/i2c-st.c
F: drivers/tty/serial/st-asc.c
+F: drivers/mmc/host/sdhci-st.c
ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
M: Lennert Buytenhek <kernel@wantstofly.org>
OpenPOWER on IntegriCloud