diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:52:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:52:22 -0800 |
| commit | fd801452a30927ec0dff84e541191e611c1afd0c (patch) | |
| tree | 3c83a39d2870694729a84db9fa4d028ee496b3a2 /sound/oss/waveartist.h | |
| parent | 79a8f1b1a481cc28701275de916ccea954c6743f (diff) | |
| parent | 7b02bec07efe1d6c7d48c786e0c1a38d28fe7245 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
JBD/JBD2: free j_wbuf if journal init fails.
ext3: Wait for proper transaction commit on fsync
ext3: retry failed direct IO allocations
Diffstat (limited to 'sound/oss/waveartist.h')
0 files changed, 0 insertions, 0 deletions