summaryrefslogtreecommitdiff
path: root/arch/cris/arch-v10/Kconfig
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-07-01 07:57:25 (GMT)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-07-01 07:57:25 (GMT)
commit24a72acac155576d630cf4304fa9cefb9b62ea1f (patch)
tree84d09427b319c613512316c658a3f6d6d8fe3dd1 /arch/cris/arch-v10/Kconfig
parent6e0b8bc965d25a8e0701eaca3fca5941b4f4b2b2 (diff)
parent8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff)
downloadlinux-fsl-qoriq-24a72acac155576d630cf4304fa9cefb9b62ea1f.tar.xz
Merge tag 'v3.10' into next
Merge 3.10 in order to get some of the last minute powerpc changes, resolve conflicts and add additional fixes on top of them.
Diffstat (limited to 'arch/cris/arch-v10/Kconfig')
0 files changed, 0 insertions, 0 deletions