summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/marzen_defconfig
diff options
context:
space:
mode:
authorSimon Horman2012-11-08 09:49:35 +0100
committerSimon Horman2012-11-08 09:49:35 +0100
commitab3ff12a78a64b851ab22726ab99dca6ad37bf94 (patch)
tree4340e41495528f1a1dc733b45a792617ff4e8992 /arch/arm/configs/marzen_defconfig
parentARM: shmobile: Remove G4EVM machine support (diff)
parentARM: shmobile: add fsi external clock sh7372 (diff)
downloadkernel-qcow2-linux-ab3ff12a78a64b851ab22726ab99dca6ad37bf94.tar.gz
kernel-qcow2-linux-ab3ff12a78a64b851ab22726ab99dca6ad37bf94.tar.xz
kernel-qcow2-linux-ab3ff12a78a64b851ab22726ab99dca6ad37bf94.zip
Merge branch 'soc' into boards
Conflicts: arch/arm/configs/marzen_defconfig
Diffstat (limited to 'arch/arm/configs/marzen_defconfig')
0 files changed, 0 insertions, 0 deletions