Linus Torvalds d145c7253c Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (27 commits)
  lguest: use __PAGE_KERNEL instead of _PAGE_KERNEL
  lguest: Use explicit includes rateher than indirect
  lguest: get rid of lg variable assignments
  lguest: change gpte_addr header
  lguest: move changed bitmap to lg_cpu
  lguest: move last_pages to lg_cpu
  lguest: change last_guest to last_cpu
  lguest: change spte_addr header
  lguest: per-vcpu lguest pgdir management
  lguest: make pending notifications per-vcpu
  lguest: makes special fields be per-vcpu
  lguest: per-vcpu lguest task management
  lguest: replace lguest_arch with lg_cpu_arch.
  lguest: make registers per-vcpu
  lguest: make emulate_insn receive a vcpu struct.
  lguest: map_switcher_in_guest() per-vcpu
  lguest: per-vcpu interrupt processing.
  lguest: per-vcpu lguest timers
  lguest: make hypercalls use the vcpu struct
  lguest: make write() operation smp aware
  ...

Manual conflict resolved (maybe even correctly, who knows) in
drivers/lguest/x86/core.c
2008-01-31 09:35:32 +11:00
..
2008-01-30 13:30:35 +01:00
2008-01-30 13:30:35 +01:00
2008-01-30 13:30:35 +01:00
2008-01-30 13:30:35 +01:00
2008-01-30 13:30:35 +01:00
2007-10-23 22:37:23 +02:00
2008-01-30 13:34:07 +01:00
2008-01-30 13:31:24 +01:00
2007-10-17 20:17:13 +02:00
2008-01-30 13:31:19 +01:00
2008-01-30 13:30:28 +01:00
2008-01-30 13:34:10 +01:00
2007-10-17 20:17:15 +02:00
2008-01-30 13:34:09 +01:00
2008-01-30 13:33:11 +01:00
2007-10-17 20:17:08 +02:00
2007-10-17 20:17:17 +02:00
2008-01-30 13:31:14 +01:00
2008-01-30 13:31:51 +01:00
2007-10-23 22:37:23 +02:00
2007-10-22 21:20:01 +02:00
2007-10-16 11:26:02 +02:00
2008-01-30 13:30:20 +01:00
2008-01-30 13:33:32 +01:00
2007-10-17 20:17:19 +02:00
2008-01-30 13:34:05 +01:00
2008-01-30 13:33:16 +01:00
2007-10-17 20:17:08 +02:00
2007-10-17 20:17:21 +02:00
2007-10-17 20:24:56 +02:00
2008-01-30 13:30:20 +01:00
2008-01-30 13:33:09 +01:00
2008-01-30 13:33:35 +01:00
2008-01-30 13:31:23 +01:00
2008-01-30 13:31:55 +01:00
2008-01-30 13:33:14 +01:00
2008-01-30 13:33:14 +01:00
2008-01-30 13:30:46 +01:00
2008-01-30 13:30:28 +01:00
2008-01-30 13:34:06 +01:00
2008-01-30 13:34:09 +01:00
2007-10-17 20:26:11 +02:00
2007-10-30 00:22:22 +01:00
2008-01-30 13:30:33 +01:00
2008-01-30 13:30:16 +01:00
2008-01-30 17:53:08 +02:00
2008-01-30 13:31:26 +01:00
2008-01-30 13:31:27 +01:00
2007-10-17 20:16:47 +02:00
2008-01-30 22:50:04 +11:00
2008-01-30 13:33:00 +01:00
2008-01-30 13:31:26 +01:00
2008-01-30 13:31:55 +01:00
2007-10-17 20:26:15 +02:00
2008-01-30 13:31:43 +01:00
2008-01-30 13:30:35 +01:00
2008-01-30 13:30:36 +01:00
2007-10-23 22:37:24 +02:00
2008-01-30 13:33:18 +01:00
2008-01-30 13:32:40 +01:00
2008-01-30 13:30:31 +01:00
2008-01-30 13:34:10 +01:00
2008-01-30 13:34:06 +01:00
2008-01-30 13:34:06 +01:00
2008-01-30 13:30:31 +01:00
2008-01-30 13:30:38 +01:00
2008-01-30 13:31:25 +01:00
2008-01-30 13:32:53 +01:00
2008-01-30 13:33:42 +01:00
2007-10-17 20:17:08 +02:00
2007-10-17 20:17:08 +02:00
2008-01-30 13:33:00 +01:00
2007-10-17 20:17:08 +02:00
2008-01-30 13:33:00 +01:00
2007-10-17 08:42:47 -07:00
2007-10-23 22:37:24 +02:00
2008-01-30 13:30:50 +01:00
2008-01-30 13:31:21 +01:00
2008-01-30 13:33:00 +01:00
2007-10-23 22:37:24 +02:00
2007-10-23 22:37:24 +02:00
2008-01-30 13:31:12 +01:00
2007-10-17 20:26:18 +02:00
2008-01-30 13:30:35 +01:00
2008-01-30 13:33:24 +01:00
2007-10-17 20:32:07 +02:00
2008-01-30 13:31:42 +01:00
2007-10-17 20:16:36 +02:00
2007-10-17 20:32:38 +02:00
2008-01-30 13:30:42 +01:00
2008-01-30 13:32:39 +01:00