Merge branch 'for-linus' into for-next

Browse source

...

This commit is contained in:

Al Viro 2015-04-11 22:29:51 -04:00

parent 165f1a6e30 64b4e2526d

commit dfea934575

4 changed files with 34 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

22

fs/aio.c

View file

17

fs/ocfs2/file.c

View file

2

include/linux/fs.h

View file

10

mm/mremap.c

View file