summaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-27 21:59:57 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-27 21:59:57 (GMT)
commit239df0fd5ee25588f8a5ba7f7ee646940cc403f4 (patch)
treebfece31a51ceec2793cb69b3ac1c936e0652bcbc /arch/arm/Kconfig
parentcc780af5aca00d573eae0e926e1d4cf1439b580e (diff)
parentae1d3b974e091b5fc9008bd41bcbdaac68110b62 (diff)
parent81479c246c07b703aeb4bf54933b7d928cb5b717 (diff)
downloadlinux-fsl-qoriq-239df0fd5ee25588f8a5ba7f7ee646940cc403f4.tar.xz
Merge branches 'devel', 'devel-stable' and 'fixes' into for-linus