diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 17:08:45 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 17:08:45 -0400 |
| commit | d9e742f5591e06d2d5a9251c9d14ac754da1e53a (patch) | |
| tree | beba3b2b1af1c8072d228e3bd4735f58d6283b29 /MAINTAINERS | |
| parent | f598f176fd84068beca7a7219f26f8d5ff59a6f6 (diff) | |
| parent | 14de48a412f00f8e0a5413844d846bc5657db327 (diff) | |
Merge tag 'keystone_dts_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt
Merge "ARM: Keystone DTS for 4.7" from Santosh Shilimkar:
- Remainder k2-* rename to keystone-*
- PSCI node info
- SPI alias nodes for bootloaders
* tag 'keystone_dts_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: keystone: dts: add psci command definition
ARM: dts: keystone: Add aliases for SPI nodes
ARM: dts: k2*: Rename the k2* files to keystone-k2* files
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 61a323a6b2cf..efa0d392f5e7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1260,7 +1260,7 @@ M: Santosh Shilimkar <ssantosh@kernel.org> | |||
| 1260 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 1260 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 1261 | S: Maintained | 1261 | S: Maintained |
| 1262 | F: arch/arm/mach-keystone/ | 1262 | F: arch/arm/mach-keystone/ |
| 1263 | F: arch/arm/boot/dts/k2* | 1263 | F: arch/arm/boot/dts/keystone-* |
| 1264 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git | 1264 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git |
| 1265 | 1265 | ||
| 1266 | ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK | 1266 | ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK |