aboutsummaryrefslogtreecommitdiff
path: root/include/asm-cris/arch-v32/mach-fs/arbiter.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 15:40:28 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 15:40:28 -0800
commit6a306e8b4c81a1c1f538e390d92bfe80d04b254c (patch)
tree9650dfaf138d9ab52affa6e93d19e32879892924 /include/asm-cris/arch-v32/mach-fs/arbiter.h
parent3bf8f5a92cd4b04e3f1e162a1b4b99759a882b5d (diff)
parent785285fc8bc7f846ab68a063a8bf5a009d67725d (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 'include/asm-cris/arch-v32/mach-fs/arbiter.h')
0 files changed, 0 insertions, 0 deletions