diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 17:40:32 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 17:40:32 +0200 |
| commit | 09d12ad7936df431ecbf0faf2b81c56cc4bb6392 (patch) | |
| tree | 730eefd698dd59556f823952531fb675f1e40455 /include/rdma/rdma_cm_ib.h | |
| parent | e0ace5fc33e2046e83b0ebbe03b7489eabd6cc03 (diff) | |
| parent | 9dddfcfacaadb5491b62233b893b510fa00da4e0 (diff) | |
| download | talos-op-linux-09d12ad7936df431ecbf0faf2b81c56cc4bb6392.tar.gz talos-op-linux-09d12ad7936df431ecbf0faf2b81c56cc4bb6392.zip | |
Merge tag 'renesas-dt-timers-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Merge "Renesas ARM Based SoC DT Timers Updates for v3.18" from Simon Horman:
* Enable timers using DT when booting boards without Legacy-C code
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-dt-timers-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: genmai-reference: Enable MTU2 in device tree
ARM: shmobile: r7s72100: Add MTU2 device to DT
ARM: shmobile: marzen-reference: Enable TMU0 in device tree
ARM: shmobile: koelsch-reference: Enable CMT0 in device tree
ARM: shmobile: lager-reference: Enable CMT0 in device tree
ARM: shmobile: r8a7779: Add TMU devices to DT
ARM: shmobile: r8a7791: Add CMT devices to DT
ARM: shmobile: r8a7790: Add CMT devices to DT
Conflicts:
arch/arm/mach-shmobile/setup-r8a7779.c
Diffstat (limited to 'include/rdma/rdma_cm_ib.h')
0 files changed, 0 insertions, 0 deletions
