diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-10 05:27:13 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-10 05:27:13 +0400 |
| commit | 93ce285503e375a4a751b632dd7b93291629c5cd (patch) | |
| tree | 83ddfe4de81a87f9fecae220782a28ae340864c1 /block/cfq-iosched.c | |
| parent | 13c5d51953441bd03cfd057e8f340100516ef24c (diff) | |
| parent | 19c7c0d81a9b1fe7342d0208b629b5e085e4f3ae (diff) | |
| download | linux-93ce285503e375a4a751b632dd7b93291629c5cd.tar.xz | |
Merge tag 'davinci-for-v3.9/dt-2' of git://gitorious.org/linux-davinci/linux-davinci into next/dt
From Sekhar Nori:
Second round of DT updates for DaVinci.
This pull request adds support for I2C0 and watchdog timer
for DA850 EVM booting using device tree. It also enables
machine reboot when using device tree.
* tag 'davinci-for-v3.9/dt-2' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: da850 DT: add support for machine reboot
ARM: davinci: da850: add wdt DT node
ARM: davinci: da850: add DT node for I2C0
Diffstat (limited to 'block/cfq-iosched.c')
0 files changed, 0 insertions, 0 deletions