diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 18:40:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 18:40:28 -0500 |
| commit | 6a306e8b4c81a1c1f538e390d92bfe80d04b254c (patch) | |
| tree | 9650dfaf138d9ab52affa6e93d19e32879892924 /fs/locks.c | |
| parent | 3bf8f5a92cd4b04e3f1e162a1b4b99759a882b5d (diff) | |
| parent | 785285fc8bc7f846ab68a063a8bf5a009d67725d (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix large MCA bootmem allocation
[IA64] Simplify cpu_idle_wait
[IA64] Synchronize RBS on PTRACE_ATTACH
[IA64] Synchronize kernel RSE to user-space and back
[IA64] Rename TIF_PERFMON_WORK back to TIF_NOTIFY_RESUME
[IA64] Wire up timerfd_{create,settime,gettime} syscalls
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions