summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/shmbuf.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 04:28:09 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 04:28:09 +0100
commitfbf07eac7bf21c262143194181bd97c5d18b8ceb (patch)
treec9228b7d272f1e39472da28032605ecd1860e688 /arch/x86/include/asm/shmbuf.h
parentMerge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parenthrtimer: Fix /proc/timer_list regression (diff)
downloadlinux-fbf07eac7bf21c262143194181bd97c5d18b8ceb.tar.xz
linux-fbf07eac7bf21c262143194181bd97c5d18b8ceb.zip
Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: hrtimer: Fix /proc/timer_list regression itimers: Fix racy writes to cpu_itimer fields timekeeping: Fix clock_gettime vsyscall time warp
Diffstat (limited to 'arch/x86/include/asm/shmbuf.h')
0 files changed, 0 insertions, 0 deletions