summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-04-04 00:33:32 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-04-04 00:33:32 +0100
commit95959e6a06720834fc80a210e37898341c63cb91 (patch)
tree832ed436b93bb7acd167d9ca8ecc4a45fc0aea22 /arch/arm/include/asm
parentf210c53a82ab9ba10574f8121a300d78e618febd (diff)
parent95c52fe063351192e0f4ffb70ef9bac1aa26f5a4 (diff)
parente26a9e00afc482b971afcaef1db8c9034d4d6d7c (diff)
parentdfdf5f63b4380b9e719145c7cb2cb450a3d06ac4 (diff)
parentaa4c5b962a7a03eb6b43b3d2677c3677022c1223 (diff)
parent1ef2bf8227abe928e149772f9e6ee9d59c1bd97e (diff)
Merge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unstable/sa11x0' into for-next