summaryrefslogtreecommitdiffstats
path: root/mm/filemap.c
diff options
context:
space:
mode:
authorLinus Torvalds2010-01-27 11:49:10 +0100
committerLinus Torvalds2010-01-27 11:49:10 +0100
commitcaf0801e0cc482497c14a9ce349469c33c60beec (patch)
tree75fc0709ecb1f02dc5b6dc6b9b7f5bfe69de98a2 /mm/filemap.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
parentx86, msr/cpuid: Pass the number of minors when unregistering MSR and CPUID dr... (diff)
downloadkernel-qcow2-linux-caf0801e0cc482497c14a9ce349469c33c60beec.tar.gz
kernel-qcow2-linux-caf0801e0cc482497c14a9ce349469c33c60beec.tar.xz
kernel-qcow2-linux-caf0801e0cc482497c14a9ce349469c33c60beec.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, msr/cpuid: Pass the number of minors when unregistering MSR and CPUID drivers. x86: Remove "x86 CPU features in debugfs" (CONFIG_X86_CPU_DEBUG) Revert "x86: ucode-amd: Load ucode-patches once ..." x86: Disable HPET MSI on ATI SB700/SB800 x86: Set hotpluggable nodes in nodes_possible_map
Diffstat (limited to 'mm/filemap.c')
0 files changed, 0 insertions, 0 deletions