diff options
| author | Linus Torvalds <[email protected]> | 2011-05-23 15:24:09 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-05-23 15:24:09 +0000 |
| commit | 34b064569eba3bec65bf98efe057b0578fe13297 (patch) | |
| tree | cee99fb8035843776ec44ec5113fb586b2b6172b /net/unix/af_unix.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ros... (diff) | |
| parent | GFS2: Wait properly when flushing the ail list (diff) | |
| download | kernel-34b064569eba3bec65bf98efe057b0578fe13297.tar.gz kernel-34b064569eba3bec65bf98efe057b0578fe13297.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
GFS2: Wait properly when flushing the ail list
GFS2: Wipe directory hash table metadata when deallocating a directory
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions