diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-11 18:30:50 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-11 18:30:50 +0200 |
commit | 5f47992491ffe2d5b2b4ea3556bc0f3c0ec9bc8b (patch) | |
tree | f43f81ab67d152c148bd3dfc1a0683d2c8306014 /Documentation/devicetree/bindings/watchdog | |
parent | staging: vme: fix bare use of 'unsigned' (diff) | |
parent | Linux 4.6-rc3 (diff) | |
download | linux-5f47992491ffe2d5b2b4ea3556bc0f3c0ec9bc8b.tar.xz linux-5f47992491ffe2d5b2b4ea3556bc0f3c0ec9bc8b.zip |
Merge 4.6-rc3 into staging-next
This resolves a lot of merge issues with PAGE_CACHE_* changes, and an
iio driver merge issue.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/watchdog')
0 files changed, 0 insertions, 0 deletions