diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-17 13:48:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-17 13:48:10 -0700 |
| commit | 3d2c978e0cd8b1157f9eebd13062d61fb7a75ad5 (patch) | |
| tree | d7e221e70d14aae2b4e5972ed9715a2cb18a3b98 /fs/ocfs2/locks.h | |
| parent | 81880d603d00c645e0890d0a44d50711c503b72b (diff) | |
| parent | b8bc1389b74c2b66255651a6fcfae56c78b6e63f (diff) | |
Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing
* 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
ptrace: Cleanup useless header
ptrace: kill BKL in ptrace syscall
Diffstat (limited to 'fs/ocfs2/locks.h')
0 files changed, 0 insertions, 0 deletions