diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-21 11:11:45 +0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-21 11:11:45 +0400 |
commit | 6fe05f33da536ac60a4c4e6807f454937047de54 (patch) | |
tree | e19b71fdaea03e4b3599d425b6f2c29bdcd97a20 /drivers/watchdog/wdrtas.c | |
parent | 3fcdc0555f5043eded6312efce14cd8dd66f30f8 (diff) | |
parent | 824b43968fed4b5a200cfef06129c0470eef306a (diff) | |
download | linux-6fe05f33da536ac60a4c4e6807f454937047de54.tar.xz |
Merge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into next/dt
From Nicolas Ferre:
More DT material for AT91:
- conversion of watchdog to DT
- usart definition for evk-pro3 board
* tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91:
ARM: at91/dts: evk-pro3: enable watchdog
ARM: at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45
watchdog: at91sam9_wdt: add device tree support
ARM: at91: dt: evk-pro3: enable uart0 and uart2
Diffstat (limited to 'drivers/watchdog/wdrtas.c')
0 files changed, 0 insertions, 0 deletions