android_kernel_xiaomi_sm8350/arch
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
..
alpha
arm spinlock: lockbreak cleanup 2008-01-30 13:31:20 +01:00
avr32
blackfin
cris
frv
h8300
ia64 [SCSI] remove use_sg_chaining 2008-01-30 13:14:02 -06:00
m32r spinlock: lockbreak cleanup 2008-01-30 13:31:20 +01:00
m68k
m68knommu
mips spinlock: lockbreak cleanup 2008-01-30 13:31:20 +01:00
parisc spinlock: lockbreak cleanup 2008-01-30 13:31:20 +01:00
powerpc Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 2008-01-31 09:31:37 +11:00
ppc
s390
sh
sparc
sparc64 percpu: use a kconfig variable to signal arch specific percpu setup 2008-01-30 13:32:51 +01:00
um UML: remove remaining FASTCALL uses 2008-01-30 13:31:14 +01:00
v850
x86 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 2008-01-31 09:35:32 +11:00
xtensa
.gitignore