commit | 67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40 | [log] [tgz] |
---|---|---|
author | Olof Johansson <olof@lixom.net> | Sat May 26 13:30:41 2012 -0700 |
committer | Olof Johansson <olof@lixom.net> | Sat May 26 13:30:41 2012 -0700 |
tree | f12706b80194f48aad3a1bd70ae9215d48875591 | |
parent | 516fb7a22a5347dc6db731369c365ed1f9b64632 [diff] | |
parent | c533f32e1ac440b8840159f89ece8c9cca2422b5 [diff] |
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>