Merge branch 'linus' into x86/uv
authorIngo Molnar <mingo@elte.hu>
Thu, 20 Nov 2008 08:02:39 +0000 (09:02 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 20 Nov 2008 08:02:39 +0000 (09:02 +0100)
commitfbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c
treefeb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3
parenta3d732f93785da17e0137210deadb4616f5536fc
parentee2f6cc7f9ea2542ad46070ed62ba7aa04d08871
Merge branch 'linus' into x86/uv
arch/x86/include/asm/uv/uv_hub.h
arch/x86/kernel/genx2apic_uv_x.c
drivers/misc/sgi-xp/xp.h