diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-25 08:51:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-25 08:51:57 -0700 |
| commit | 25f6a53799d667283d3bee29a6ac75ae3dae38dc (patch) | |
| tree | 9af7509d3ab1ddce7e5a5672cbd7aa3ca5d27c6f /tools/perf/scripts/python/netdev-times.py | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid (diff) | |
| parent | jfs: preserve i_mode if __jfs_set_acl() fails (diff) | |
| download | linux-dev-25f6a53799d667283d3bee29a6ac75ae3dae38dc.tar.xz linux-dev-25f6a53799d667283d3bee29a6ac75ae3dae38dc.zip | |
Merge tag 'jfs-4.13' of git://github.com/kleikamp/linux-shaggy
Pull JFS fixes from David Kleikamp.
* tag 'jfs-4.13' of git://github.com/kleikamp/linux-shaggy:
jfs: preserve i_mode if __jfs_set_acl() fails
jfs: Don't clear SGID when inheriting ACLs
jfs: atomically read inode size
Diffstat (limited to 'tools/perf/scripts/python/netdev-times.py')
0 files changed, 0 insertions, 0 deletions