summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-20 09:53:50 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-20 09:53:50 -0800
commit9e0afb9437c68be62085d74407b169732108a929 (patch)
tree5f29dc868c0844bcccd784730579c1ef05b77cc6 /arch/x86/kernel/setup.c
parent7aeb3be341cc7f1fbf2b98fbef980a816736fe8e (diff)
parent65ada547d68dc075aa06df92fe325bff07cbc606 (diff)
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: clocksource: sh_cmt: Remove nested spinlock fix
Diffstat (limited to 'arch/x86/kernel/setup.c')
0 files changed, 0 insertions, 0 deletions