diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-27 01:06:08 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-27 01:06:08 +0200 |
| commit | eb99adde31b7d85c67a5e1c2fa5e098e1056dd79 (patch) | |
| tree | 05d61251361c04f3afa64c5b1fe162558724d345 /drivers/media/video/pvrusb2/pvrusb2-std.h | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | [PATCH] fs/ocfs2/dlm/: cleanups (diff) | |
| download | linux-eb99adde31b7d85c67a5e1c2fa5e098e1056dd79.tar.xz linux-eb99adde31b7d85c67a5e1c2fa5e098e1056dd79.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (56 commits)
[PATCH] fs/ocfs2/dlm/: cleanups
ocfs2: fix compiler warnings in dlm_convert_lock_handler()
ocfs2: dlm_print_one_mle() needs to be defined
ocfs2: remove whitespace in dlmunlock.c
ocfs2: move dlm work to a private work queue
ocfs2: fix incorrect error returns
ocfs2: tune down some noisy messages during dlm recovery
ocfs2: display message before waiting for recovery to complete
ocfs2: mlog in dlm_convert_lock_handler() should be ML_ERROR
ocfs2: retry operations when a lock is marked in recovery
ocfs2: use cond_resched() in dlm_thread()
ocfs2: use GFP_NOFS in some dlm operations
ocfs2: wait for recovery when starting lock mastery
ocfs2: continue recovery when a dead node is encountered
ocfs2: remove unneccesary spin_unlock() in dlm_remaster_locks()
ocfs2: dlm_remaster_locks() should never exit without completing
ocfs2: special case recovery lock in dlmlock_remote()
ocfs2: pending mastery asserts and migrations should block each other
ocfs2: temporarily disable automatic lock migration
ocfs2: do not unconditionally purge the lockres in dlmlock_remote()
...
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-std.h')
0 files changed, 0 insertions, 0 deletions