diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 11:59:08 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 11:59:08 +0100 |
commit | 42cbe8271ca6562b4ad4b2e6a9895084b16eef5e (patch) | |
tree | c45511d5527b601a8a00e4a8958a83b1bfb8c967 /arch/arm/mach-highbank/Kconfig | |
parent | Merge branch 'devel-stable' into for-next (diff) | |
parent | ARM: 7880/1: Clear the IT state independent of the Thumb-2 mode (diff) | |
parent | ARM: 7834/1: mmc: mmci: Save and restore register context (diff) | |
parent | ARM: sa11x0/assabet: ensure CS2 is configured appropriately (diff) | |
download | linux-42cbe8271ca6562b4ad4b2e6a9895084b16eef5e.tar.xz linux-42cbe8271ca6562b4ad4b2e6a9895084b16eef5e.zip |
Merge branches 'fixes', 'mmci' and 'sa11x0' into for-next