aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-12 08:40:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-12 08:40:23 -0800
commit25a34554d600b799cbf5159bef372b02d3b4e1c6 (patch)
tree35a6988f629f234c66b030f83e8f1485140111fb /fs
parentMerge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff)
parentx86, pvclock: Remove leftover scale_delta() function (diff)
downloadlinux-dev-25a34554d600b799cbf5159bef372b02d3b4e1c6.tar.xz
linux-dev-25a34554d600b799cbf5159bef372b02d3b4e1c6.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, pvclock: Remove leftover scale_delta() function x86, apic: Remove double #include x86: Adjust section annotations in AMD Fam10 MMCONF enabling code x86, UV: Update node controller MMRs x86: Remove unnecessary casts of void ptr returning alloc function return values x86: Address gcc4.6 "set but not used" warnings in apic.h x86, mm: Fix section mismatch in tlb.c
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions