aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/swapops.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-23 16:49:37 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-23 16:49:37 -0400
commitcd0e075784f4bce97b4ed47d4b354f045e895546 (patch)
tree2354d4c2f5185c59dc21c537841b55c694cc53ec /include/linux/swapops.h
parent32fc9eb5b2dcebefb7fb4c8288c739c320362524 (diff)
parentbc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff)
Merge 4.0-rc5 into usb-next
We want the USB fixes in here as well to resolve merge conflicts. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/swapops.h')
0 files changed, 0 insertions, 0 deletions