aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx5/efika.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 09:11:34 -0400
committerArnd Bergmann <arnd@arndb.de>2011-10-31 09:11:34 -0400
commit09fa31a322c8f03871a741cd1d26e5ca04aacbbd (patch)
treeacdad13d7c332978a91231c4f34b6320a1c7ceb6 /arch/arm/mach-mx5/efika.h
parent2b228e8cf33dbdd323dd4a05a973c6bd45c44133 (diff)
parentf37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff)
Merge branch 'dt/gic' into highbank/soc
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-mx5/efika.h')
0 files changed, 0 insertions, 0 deletions