diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-20 22:16:18 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-20 22:16:18 +1000 |
| commit | 7152431e02a236c984bad867f0d049f8dd05f6c0 (patch) | |
| tree | 23e5f3ec28b82f2f248081d3366775a9af38f8d3 /MAINTAINERS | |
| parent | 206272798eb35ff8f0e05a5b6e521836d8b6d20f (diff) | |
| parent | bc3e452003d02b8ec21546490aaed36003a83864 (diff) | |
Merge remote-tracking branch 'init/init-v4.1-rc6'
Conflicts:
arch/arm/mach-hisi/headsmp.S
arch/arm/mach-keystone/platsmp.c
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions