diff options
author | Olof Johansson <olof@lixom.net> | 2015-01-14 19:42:15 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-01-14 19:42:15 -0500 |
commit | 73298072885318557841a29dc0b99b5f0b4e2316 (patch) | |
tree | 0acfb38b09a199d62baff8c40d1ac5fa8ab41f63 /fs/super.c | |
parent | e6c077707fa5b79a20accb2e541bd1d076fd2576 (diff) | |
parent | c6574542149dede8093e326d2c358ba447e30f33 (diff) |
Merge tag 'mvebu-soc-3.20' of git://git.infradead.org/linux-mvebu into next/soc
Merge "mvebu: SoC for 3.20" from Andrew Lunn:
mvebu SoC changes for v3.20 (part #1)
- Update the SoC ID and revision definitions
- Add UART1 as DEBUG_LL possible target
- Rename DEBUG_LL to indicate UART index
* tag 'mvebu-soc-3.20' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Update the SoC ID and revision definitions
ARM: mvebu: Add UART1 as DEBUG_LL possible target
ARM: mvebu: Rename DEBUG_LL to indicate UART index
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/super.c')
0 files changed, 0 insertions, 0 deletions