diff options
author | Olof Johansson <olof@lixom.net> | 2011-12-19 21:12:47 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-19 21:12:53 -0800 |
commit | 4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a (patch) | |
tree | 0ac643f1a0c57a88452ef017c61d325fab98d00a /net/ipv4 | |
parent | f68453e076dcf140c4a7bdd385f239b1e41be983 (diff) | |
parent | 1b46f8782c2607afa1298b0c7f7fe307fc0f7a5b (diff) | |
download | blackbird-op-linux-4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a.tar.gz blackbird-op-linux-4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a.zip |
Merge branch 'picoxcell/devel' into next/devel
* picoxcell/devel: (1 commit)
ARM: picoxcell: implement watchdog restart
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions