summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm
diff options
context:
space:
mode:
authorJoerg Roedel <joro@8bytes.org>2013-09-12 16:46:34 +0200
committerJoerg Roedel <joro@8bytes.org>2013-09-12 16:46:34 +0200
commitd6a60fc1a8187004792a01643d8af1d06a465026 (patch)
tree033a6976e47fc49c5f095c38008f1d1f6be5f93e /arch/powerpc/include/asm
parent6e4664525b1db28f8c4e1130957f70a94c19213e (diff)
parentca19243e9ce81f8e8a25ee33969444f11b0590b7 (diff)
parent634544bf718dd29cd2e29efba6801a8d08daf335 (diff)
parentecfadb6e5b49a0a56df2038bf39f1fcd652788b9 (diff)
parente644a013fe67f2bccd54378b88556d07fa2714d6 (diff)
parent3269ee0bd6686baf86630300d528500ac5b516d7 (diff)
Merge branches 'arm/exynos', 'ppc/pamu', 'arm/smmu', 'x86/amd' and 'iommu/fixes' into next