summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-28 21:31:33 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-28 21:31:33 +0100
commit8d735b4148d46446e64d72b22ef0344ee8dc02fa (patch)
tree3a42468378460b7c205409ed2feab1c6f6422af8 /arch/x86/kernel
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff)
parent[IA64] Fix kstat_this_cpu build breakage (diff)
downloadlinux-8d735b4148d46446e64d72b22ef0344ee8dc02fa.tar.xz
linux-8d735b4148d46446e64d72b22ef0344ee8dc02fa.zip
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 kstat_this_cpu build breakage
Diffstat (limited to 'arch/x86/kernel')
0 files changed, 0 insertions, 0 deletions