diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 08:13:24 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 08:13:24 +0200 |
commit | 9c2edd8b5bcb36ec6c890dd85f8fd13034aaa43e (patch) | |
tree | 052b3c229e00462cd0c5773c8b6b9fe314e86f38 /lib/nodemask.c | |
parent | staging: octeon: Use IS_ENABLED() instead of checking for built-in or module (diff) | |
parent | Linux 4.8-rc5 (diff) | |
download | linux-9c2edd8b5bcb36ec6c890dd85f8fd13034aaa43e.tar.xz linux-9c2edd8b5bcb36ec6c890dd85f8fd13034aaa43e.zip |
Merge 4.8-rc5 into staging-next
We want the staging fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib/nodemask.c')
0 files changed, 0 insertions, 0 deletions