]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5003d60 382c242)
Merge branch 'stable/for-linus-3.8' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 16 Jan 2013 21:24:51 +0000 (16:24 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 16 Jan 2013 21:24:51 +0000 (16:24 -0500)
* stable/for-linus-3.8:
  xen/grant-table: Force to use v1 of grants.
  xen: Fix stack corruption in xen_failsafe_callback for 32bit PVOPS guests.
  Revert "xen/smp: Fix CPU online/offline bug triggering a BUG: scheduling while atomic."

Conflicts:
drivers/xen/grant-table.c

1  2 
arch/x86/kernel/entry_32.S patch | diff1 | diff2 | blob | history
arch/x86/xen/smp.c patch | diff1 | diff2 | blob | history
drivers/xen/grant-table.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/entry_32.S
Simple merge
diff --cc arch/x86/xen/smp.c
Simple merge
diff --cc drivers/xen/grant-table.c
Simple merge
Linux kernel for KaRo TX COM modules