| commit | 34b064569eba3bec65bf98efe057b0578fe13297 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 23 08:24:09 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 23 08:24:09 2011 -0700 |
| tree | cee99fb8035843776ec44ec5113fb586b2b6172b | |
| parent | 2e77defc5da779888f3cf65e66cd3d47ae2d690f [diff] | |
| parent | 26b06a6958df0f12f1a654db8598433eb89cc024 [diff] |
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