diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-26 13:30:41 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-26 13:30:41 -0700 |
commit | 67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40 (patch) | |
tree | f12706b80194f48aad3a1bd70ae9215d48875591 /arch/arm/plat-samsung | |
parent | 516fb7a22a5347dc6db731369c365ed1f9b64632 (diff) | |
parent | c533f32e1ac440b8840159f89ece8c9cca2422b5 (diff) | |
download | talos-obmc-linux-67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40.tar.gz talos-obmc-linux-67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40.zip |
Merge branch 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux into late/soc
A few device tree updates and an include file fix for versatile.
* 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux:
ARM: vexpress: Remove twice included header files
ARM: vexpress: Device Tree updates
+ update to 3.4
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-samsung')
0 files changed, 0 insertions, 0 deletions