]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit
Merge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into next/dt
authorOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 07:11:45 +0000 (23:11 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 07:11:45 +0000 (23:11 -0800)
commit6fe05f33da536ac60a4c4e6807f454937047de54
treee19b71fdaea03e4b3599d425b6f2c29bdcd97a20
parent3fcdc0555f5043eded6312efce14cd8dd66f30f8
parent824b43968fed4b5a200cfef06129c0470eef306a
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