diff options
| author | Linus Torvalds | 2009-06-23 19:36:02 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2009-06-23 19:36:02 -0700 |
| commit | cf5434e894a17bb8385997adc6d56642055a85d6 (patch) | |
| tree | 60a02d312038f24ca24578ebefb47391d4a63c13 /drivers/ata | |
| parent | 7b58fc21847950db8fcc6a142288b042564ffb76 (diff) | |
| parent | d246ab307d1d003c80fe279897dea22bf52b6e41 (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/trivial: Wrap ocfs2_sysfile_cluster_lock_key within define.
ocfs2: Add lockdep annotations
vfs: Set special lockdep map for dirs only if not set by fs
ocfs2: Disable orphan scanning for local and hard-ro mounts
ocfs2: Do not initialize lvb in ocfs2_orphan_scan_lock_res_init()
ocfs2: Stop orphan scan as early as possible during umount
ocfs2: Fix ocfs2_osb_dump()
ocfs2: Pin journal head before accessing jh->b_committed_data
ocfs2: Update atime in splice read if necessary.
ocfs2: Provide the ocfs2_dlm_lvb_valid() stack API.
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions