diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-01 18:01:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-01 18:01:41 -0700 |
| commit | 1f2609460c4a96ef19c6bd2dadea46ad47e6dfa1 (patch) | |
| tree | 1084e6380e8993f5db802e849d0bfae5bc5fbed5 /net/ipv6/raw.c | |
| parent | f88cf230a43e08b3fb615e0520900a414f037440 (diff) | |
| parent | 6d2b6170c8914c6c69256b687651fb16d7ec3e18 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"This contains a couple of fixes - one is the aio fix from Christoph,
the other a fallocate() one from Eric"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
vfs: fix check for fallocate on active swapfile
direct-io: fix AIO regression
Diffstat (limited to 'net/ipv6/raw.c')
0 files changed, 0 insertions, 0 deletions