diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-14 18:29:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-14 18:29:08 -0400 |
| commit | 4e337adae4e960f64043b9f433c4a825c902616c (patch) | |
| tree | 407ea9edaec1ec666e5a0a6368dc51be2bc913c9 /arch/i386/kernel/nmi.c | |
| parent | 0bdd0f385a44344f83409b9e00797bfe2596faf8 (diff) | |
| parent | b36c3f84988eebf38acaccc756e05f6b70e333ab (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2_dlm: Add missing locks in dlm_empty_lockres
ocfs2_dlm: Missing get/put lockres in dlm_run_purge_lockres
configfs: add missing mutex_unlock()
ocfs2: add some missing address space callbacks
ocfs2: Concurrent access of o2hb_region->hr_task was not locked
ocfs2: Proper cleanup in case of error in ocfs2_register_hb_callbacks()
Diffstat (limited to 'arch/i386/kernel/nmi.c')
0 files changed, 0 insertions, 0 deletions