diff options
| author | Olof Johansson <olof@lixom.net> | 2014-08-07 15:03:02 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-08-07 15:03:02 -0700 |
| commit | c4846a7823bfd34ecb2dc56b025e19285432d08d (patch) | |
| tree | a2b5d4140a38566cb4ba12c7cc9813a47846def5 /MAINTAINERS | |
| parent | 94f30477fc5be19d26785fe5262eb4f0ac07a3d4 (diff) | |
| parent | fc5130de8309727540de7cae0199764af34b0919 (diff) | |
Merge branch 'next/fixes-non-critical' into next/cleanup
Merging in the few fixes we had also received, no need to keep those in
a separate branch.
* next/fixes-non-critical:
drivers: CCI: Correct use of ! and &
MAINTAINERS: Add sdhci-st file to ARCH/STI architecture
ARM: EXYNOS: Fix build breakge with PM_SLEEP=n
ARM: omap2+: gpmc-nand: Use dynamic platform_device_alloc()
omap16xx: Removes fixme no longer needed in ocpi_enable()
ARM: dts: OMAP5: Add device nodes for ABB
ARM: omap2+: usb-tusb6010.c: Cleaning up variable is set more than once
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0ea20364718..f561562f2a9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1356,6 +1356,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> |