tree 832ed436b93bb7acd167d9ca8ecc4a45fc0aea22
parent f210c53a82ab9ba10574f8121a300d78e618febd
parent 95c52fe063351192e0f4ffb70ef9bac1aa26f5a4
parent e26a9e00afc482b971afcaef1db8c9034d4d6d7c
parent dfdf5f63b4380b9e719145c7cb2cb450a3d06ac4
parent aa4c5b962a7a03eb6b43b3d2677c3677022c1223
parent 1ef2bf8227abe928e149772f9e6ee9d59c1bd97e
author Russell King <rmk+kernel@arm.linux.org.uk> 1396568012 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1396568012 +0100

Merge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unstable/sa11x0' into for-next