diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-10 05:03:08 +0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-10 05:03:16 +0400 |
commit | 13c5d51953441bd03cfd057e8f340100516ef24c (patch) | |
tree | fc574e5468ab732da3bd20c54aaefa2d1b7f4636 /kernel/tsacct.c | |
parent | 5b22c33e8e52ea0e2530037da1f97e88c0b42214 (diff) | |
parent | ce3b2630fd4737a3f9aa9119d40647a9ac7baa38 (diff) | |
download | linux-13c5d51953441bd03cfd057e8f340100516ef24c.tar.xz |
Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
From Nicolas Ferre:
Update to DT files for AT91:
- adding the watchdog to Animeo IP board
- some more DT support for at91rm9200 peripherals
* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
ARM: at91: add EMAC bindings to RM9200 DT
ARM: at91: add SSC bindings to RM9200 DT
ARM: at91: add MMC bindings to RM9200 DT
ARM: at91: Animeo IP: enable watchdog support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'kernel/tsacct.c')
0 files changed, 0 insertions, 0 deletions