diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 15:11:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 15:11:57 -0400 |
| commit | 300df7dc89cc276377fc020704e34875d5c473b6 (patch) | |
| tree | 6b280000815b0562255cecf3da1a8c9597bce702 /drivers/ide/ide-pm.c | |
| parent | 661adc423d70203a56723701aaf255e16950dfdb (diff) | |
| parent | 9af0b38ff3f4f79c62dd909405b113bf7c1a23aa (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2/net: Use wait_event() in o2net_send_message_vec()
ocfs2: Adjust rightmost path in ocfs2_add_branch.
ocfs2: fdatasync should skip unimportant metadata writeout
ocfs2: Remove redundant gotos in ocfs2_mount_volume()
ocfs2: Add statistics for the checksum and ecc operations.
ocfs2 patch to track delayed orphan scan timer statistics
ocfs2: timer to queue scan of all orphan slots
ocfs2: Correct ordering of ip_alloc_sem and localloc locks for directories
ocfs2: Fix possible deadlock in quota recovery
ocfs2: Fix possible deadlock with quotas in ocfs2_setattr()
ocfs2: Fix lock inversion in ocfs2_local_read_info()
ocfs2: Fix possible deadlock in ocfs2_global_read_dquot()
ocfs2: update comments in masklog.h
ocfs2: Don't printk the error when listing too many xattrs.
Diffstat (limited to 'drivers/ide/ide-pm.c')
0 files changed, 0 insertions, 0 deletions