diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-27 17:19:15 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-27 17:19:15 -0700 |
| commit | b521d929b330d665cb3a42b26eaaa5690dc9dad7 (patch) | |
| tree | 7c1ddf1c06922c4728b6625fb10cf11de5a29387 /arch/arm/mach-ks8695 | |
| parent | 83b5938ce77bbbd9a04e5270ef2b3f17921bf0d4 (diff) | |
| parent | d405e4b07a15b9d24d504a459295cf00a618c10c (diff) | |
Merge branch 'tegra/soc' into next/cleanup2
Conflicts:
arch/arm/mach-tegra/Makefile
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-ks8695')
0 files changed, 0 insertions, 0 deletions