diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-03 03:20:59 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-03 03:20:59 +0300 |
commit | deef2a118aed02aa9421e399056c82045e728282 (patch) | |
tree | ffd415cb12df4d1afba0a5f9f37bf17dc3f5e86f /arch/sparc/include/uapi/asm/watchdog.h | |
parent | aa9d9be96d33d97488e1bdf13a144931a3fce08e (diff) | |
parent | 009d0431c3914de64666bec0d350e54fdd59df6a (diff) | |
download | linux-deef2a118aed02aa9421e399056c82045e728282.tar.xz |
Merge 3.18-rc7 into staging-work.
We want those staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sparc/include/uapi/asm/watchdog.h')
0 files changed, 0 insertions, 0 deletions