aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-27 02:47:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-27 02:47:24 -0800
commit5bc6d799e1158b0a9d99fe1d92b397214fa76f91 (patch)
treed6c8d0819ed5e9ed682d34903c4d1aa784739a64 /arch/x86
parentb04da8bfdfbbd79544cab2fadfdc12e87eb01600 (diff)
parent6abce7711fcbd72b42f0c9632c1beccf4e674663 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Fix UP build.
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions