summaryrefslogtreecommitdiffstats
path: root/arch/microblaze
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-14 11:01:44 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-14 11:01:44 +0100
commitb7c11ec9f1c9f4272f032215ddb0b65d64b22ecc (patch)
treec65b81ef9ae5076d2137034accfa2610f45a13de /arch/microblaze
parent06099961002a813324d057a91695af7c72939da6 (diff)
parent7666c17e2b0986a079da46122d8658544416c2cf (diff)
downloadblackbird-op-linux-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.tar.gz
blackbird-op-linux-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.zip
Merge branch 'u300' into devel
Conflicts: arch/arm/Makefile Updates: arch/arm/mach-u300/core.c arch/arm/mach-u300/timer.c
Diffstat (limited to 'arch/microblaze')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud