diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 09:45:28 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 09:45:28 -0400 |
commit | 3b325a494ba8835b9dc85c7dcc23b887c7deb119 (patch) | |
tree | 5e94675e5407066a286201121c62be656fbc8cf2 /fs/ext4/super.c | |
parent | 8efa50c5e1684b1168fa6b67de19c7f399cb1874 (diff) | |
parent | 7aa2077b55b530fac878e7c05fc970a778eb3950 (diff) |
Merge tag 'armsoc/for-3.15/soc-3' of git://github.com/broadcom/mach-bcm into next/soc
Merge "ARM: mach-bcm: soc updates for 3.15 - part 2" from Matt Porter:
- Add bcm21664 support
- Use Kona Debug UART only on ARCH_BCM_MOBILE
* tag 'armsoc/for-3.15/soc-3' of git://github.com/broadcom/mach-bcm:
ARM: restrict BCM_KONA_UART to ARCH_BCM_MOBILE
ARM: bcm21664: Add board support.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/ext4/super.c')
0 files changed, 0 insertions, 0 deletions