Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 20 Apr 2009 16:08:07 +0000 (18:08 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 20 Apr 2009 16:08:12 +0000 (18:08 +0200)
commit62d170290979e0bb805d969cca4ea852bdd45260
tree837372297501a2d144358b44e7db3f88c5612aa2
parent8b5b94e4e9813cdd77103827f48d58c806ab45c6
parentd91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a
Merge branch 'linus' into x86/urgent

Merge reason: We need the x86/uv updates from upstream, to queue up
              dependent fix.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Documentation/kernel-parameters.txt
arch/x86/kernel/apic/x2apic_uv_x.c