summaryrefslogtreecommitdiff
path: root/arch/nios2/Kconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-12-24 09:31:35 -0500
committerTom Rini <trini@konsulko.com>2015-12-24 09:31:35 -0500
commit40253dd12a64086885097d253b665c9876635e76 (patch)
treeab93904ec84b33c1e9336baa8eae710dd957683f /arch/nios2/Kconfig
parent8182b41994f0b1824c31652d64171ffa596517fc (diff)
parente662573822d24dcdc079d29ff397cb8bacf97b27 (diff)
downloadu-boot-imx-40253dd12a64086885097d253b665c9876635e76.zip
u-boot-imx-40253dd12a64086885097d253b665c9876635e76.tar.gz
u-boot-imx-40253dd12a64086885097d253b665c9876635e76.tar.bz2
Merge git://git.denx.de/u-boot-socfpga
Conflicts: include/configs/axs101.h Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/nios2/Kconfig')
0 files changed, 0 insertions, 0 deletions