diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 21:08:40 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 21:08:40 +0900 |
commit | 5cad3598ea0cdb817681f74518d3213583a04f7a (patch) | |
tree | 792786bea205f6eef7274b65e1e1e63d21df511d /arch/arm/include/asm/timex.h | |
parent | 638c87a91666df1f16866badee862ce38bf31e4a (diff) | |
parent | 94fda49a948a5999699359313a2f857f9d11ff19 (diff) | |
download | blackbird-op-linux-5cad3598ea0cdb817681f74518d3213583a04f7a.tar.gz blackbird-op-linux-5cad3598ea0cdb817681f74518d3213583a04f7a.zip |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze arch updates from Michal Simek.
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
Revert "microblaze_mmu_v2: Update signal returning address"
microblaze: Added more support for PCI
microblaze: Prefer to use pr_XXX instead of printk(KERN_XX)
microblaze: Fix bug with passing command line
microblaze: Remove PAGE properties duplication
microblaze: Remove additional andi which has been already done
microblaze: Use predefined macro for ESR_DIZ
microblaze: Support 4k/16k/64k pages
microblaze: Do not used hardcoded value in exception handler
microblaze: Added fdt chosen capability for timer
microblaze: Add support for ioreadXX/iowriteXX_rep
microblaze: Improve failure handling for GPIO reset
microblaze: clinkage.h
Diffstat (limited to 'arch/arm/include/asm/timex.h')
0 files changed, 0 insertions, 0 deletions