diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-23 16:36:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-23 16:36:48 -0800 |
| commit | eda4b716ea1f2a647a39cebae66b3fae4c4b80e4 (patch) | |
| tree | ab4318b72be4635c1213aa0def631e1169307660 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'linus-hot-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 (diff) | |
| parent | ocfs2: Fix system inodes cache overflow. (diff) | |
| download | wireguard-linux-eda4b716ea1f2a647a39cebae66b3fae4c4b80e4.tar.xz wireguard-linux-eda4b716ea1f2a647a39cebae66b3fae4c4b80e4.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2: Fix system inodes cache overflow.
ocfs2: Hold ip_lock when set/clear flags for indexed dir.
ocfs2: Adjust masklog flag values
Ocfs2: Teach 'coherency=full' O_DIRECT writes to correctly up_read i_alloc_sem.
ocfs2/dlm: Migrate lockres with no locks if it has a reference
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions