summaryrefslogtreecommitdiffstats
path: root/fs/eventpoll.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-07 11:03:02 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-07 11:03:02 +0200
commitc610f7f772aa06ae2bd8e5ace87cde4d90f70198 (patch)
tree6991a32acd3d63685c184734869877707fa73d1c /fs/eventpoll.c
parentstaging: lustre: orthography & coding style (diff)
parentLinux 4.0-rc7 (diff)
downloadlinux-c610f7f772aa06ae2bd8e5ace87cde4d90f70198.tar.xz
linux-c610f7f772aa06ae2bd8e5ace87cde4d90f70198.zip
Merge 4.0-rc7 into staging-next
We want those fixes (iio primarily) into the -next branch to help with merge and testing issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/eventpoll.c')
0 files changed, 0 insertions, 0 deletions