aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-19 20:27:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-19 20:27:25 -0800
commit12fcdba1b7ae8b25696433f420b775aeb556d89b (patch)
tree2826a8e5ebce9296ae8a53f2eb35c49946aadeee /init/main.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentx86: Unify "numa=" command line option handling (diff)
downloadlinux-dev-12fcdba1b7ae8b25696433f420b775aeb556d89b.tar.xz
linux-dev-12fcdba1b7ae8b25696433f420b775aeb556d89b.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: Unify "numa=" command line option handling Revert "x86: Make relocatable kernel work with new binutils"
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions