diff --git a/[refs] b/[refs] index d06a9f3b4b76..f0985e876e7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5092301c7250d7459b79fe40dae43eca3b518e92 +refs/heads/master: 3442682a54a9f44047efe526869aa52bd74fe16e diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c index f2e314b5b5fa..172a83e57ee7 100644 --- a/trunk/arch/x86/kernel/setup.c +++ b/trunk/arch/x86/kernel/setup.c @@ -806,4 +806,3 @@ void __init setup_arch(char **cmdline_p) #endif #endif } -