diff options
author | Olof Johansson <olof@lixom.net> | 2013-01-14 19:16:35 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-01-14 19:16:35 +0100 |
commit | 00c82d64405631967dca3890a9ce80ab35d04cc7 (patch) | |
tree | 2ef1fccade5b6ca2905c689ed81278fe2811acdc /fs/nfs | |
parent | Merge branch 'timer/cleanup' into next/cleanup (diff) | |
parent | ARM: at91: fix board-rm9200-dt after sys_timer conversion (diff) | |
download | linux-00c82d64405631967dca3890a9ce80ab35d04cc7.tar.xz linux-00c82d64405631967dca3890a9ce80ab35d04cc7.zip |
Merge branch 'timer/cleanup' into next/cleanup
One more board file fixup from the sys_timer cleanup.
* timer/cleanup:
ARM: at91: fix board-rm9200-dt after sys_timer conversion
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions