diff options
author | Simon Horman | 2012-11-08 09:49:35 +0100 |
---|---|---|
committer | Simon Horman | 2012-11-08 09:49:35 +0100 |
commit | ab3ff12a78a64b851ab22726ab99dca6ad37bf94 (patch) | |
tree | 4340e41495528f1a1dc733b45a792617ff4e8992 /arch/arm/configs/marzen_defconfig | |
parent | ARM: shmobile: Remove G4EVM machine support (diff) | |
parent | ARM: shmobile: add fsi external clock sh7372 (diff) | |
download | kernel-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