Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen...
commitcbcb340cb6a6f9f32724c90493f509dd41105e20
authorIngo Molnar <mingo@elte.hu>
Thu, 20 Aug 2009 10:05:24 +0000 (20 12:05 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 20 Aug 2009 10:05:24 +0000 (20 12:05 +0200)
tree18e089ee1c74700e59e668de5aed744b15089586
parent78b89ecd731798f2fec8cc26ca90739253cec33c
parentce2eef33d35cd7b932492b5a81fb0febd2b323cd
Merge branch 'bugfix' of git://git./linux/kernel/git/jeremy/xen into x86/urgent
arch/x86/kernel/cpu/Makefile
arch/x86/xen/Makefile
arch/x86/xen/enlighten.c