diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 18:03:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 18:03:02 -0800 |
| commit | 6ed23fd6c08b3ffa17c1f841098d2fa2ab3a59dd (patch) | |
| tree | 5cb5bb5dbefbb6458eff4bdae3c091ca3c02d685 /fs/ocfs2/journal.c | |
| parent | 5ee354a0295c34aa7da07be8490f86edee2c7883 (diff) | |
| parent | 2174f6df7891fa331800beb72634c969f017900b (diff) | |
Merge branch 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
* 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
pstore: gracefully handle NULL pstore_info functions
pstore: pass reason to backend write callback
Diffstat (limited to 'fs/ocfs2/journal.c')
0 files changed, 0 insertions, 0 deletions