diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-08 19:49:58 -0400 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-08 20:14:15 -0400 |
| commit | d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1 (patch) | |
| tree | e2b4bb46fa00f0ad20447e40dba6fb21a4ae0815 /fs/ocfs2/locks.h | |
| parent | c9243f5bdd6637b2bb7dc254b54d9edf957ef17e (diff) | |
| parent | 45d7f32c7a43cbb9592886d38190e379e2eb2226 (diff) | |
Merge commit 'linus/master' into bkl/core
Merge reason: The staging tree has introduced the easycap
driver lately. We need the latest updates to pushdown the
bkl in its ioctl helper.
Diffstat (limited to 'fs/ocfs2/locks.h')
0 files changed, 0 insertions, 0 deletions