diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-07-26 11:54:21 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-07-26 11:54:21 -0400 |
| commit | 944483d0330bb497549977aa9649be6b7d0ede37 (patch) | |
| tree | 545d9c5498e0dbe7697b36ad50379a815b48ec1b /MAINTAINERS | |
| parent | 03eea7cda20128f97fa281650ada69fe19194d56 (diff) | |
| parent | fd9f5edf6e7e8a666f3672fd809f3289c2da388a (diff) | |
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-- | MAINTAINERS | 1 |
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 | |||
| 1364 | F: drivers/media/rc/st_rc.c | 1364 | F: drivers/media/rc/st_rc.c |
| 1365 | F: drivers/i2c/busses/i2c-st.c | 1365 | F: drivers/i2c/busses/i2c-st.c |
| 1366 | F: drivers/tty/serial/st-asc.c | 1366 | F: drivers/tty/serial/st-asc.c |
| 1367 | F: drivers/mmc/host/sdhci-st.c | ||
| 1367 | 1368 | ||
| 1368 | ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT | 1369 | ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT |
| 1369 | M: Lennert Buytenhek <kernel@wantstofly.org> | 1370 | M: Lennert Buytenhek <kernel@wantstofly.org> |