summaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
authorSimon Horman <horms+renesas@verge.net.au>2013-08-06 18:06:53 +0900
committerSimon Horman <horms+renesas@verge.net.au>2013-08-06 18:06:53 +0900
commit4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793 (patch)
tree3932656b422e63e3d3fc4629a57a1a8b7f03ef42 /arch/arm64
parent98724b7ec9d34d875fc193660c87d6dd0d17ceb7 (diff)
parent8b3e32c1fe5dce55e28e76b20361841dc863ec17 (diff)
downloadblackbird-op-linux-4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793.tar.gz
blackbird-op-linux-4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793.zip
Merge branch 'dt2' into cleanup3-base
Conflicts: arch/arm/mach-shmobile/Makefile.boot
Diffstat (limited to 'arch/arm64')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud