]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d6393d5 05e4681)
Merge branch 'next/boards' into for-next
authorOlof Johansson <olof@lixom.net>
Thu, 22 May 2014 05:08:48 +0000 (22:08 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 22 May 2014 05:08:48 +0000 (22:08 -0700)
commitf464149d06b5e8d7eee4604357ee93ebeee43888
treee842c7b9bf7e81a5f1f1f6995f15888167febd97tree | snapshot
parentd6393d54251c180ada4e4d2b1fe4b8554eb744b0commit | diff
parent05e46817949b79d11bf57fdbf9d46b178fb1018ecommit | diff
Merge branch 'next/boards' into for-next

* next/boards:
  ARM: shmobile: Remove Genmai reference DTS
  ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB
  ARM: shmobile: Sync Genmai DTS with Genmai reference DTS
  ARM: shmobile: genmai-reference: Remove legacy clock support
  ARM: shmobile: Remove non-multiplatform Genmai reference support

Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/Makefile diff1 | diff2 | blob | history
arch/arm/mach-shmobile/Kconfig diff1 | diff2 | blob | history
arch/arm/mach-shmobile/Makefile diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules