]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit02638f0193d46686a29e9b6b560c576dd15df2bf
tree9b82d0c3c06e54ddca5127a5a52ef9bda1828fcftree | snapshot
parent5003d602aafbbfa3399690bd911d0b5736314898commit | diff
parent382c2422150c4636f057f29c01eb7619265eb112commit | diff
Merge branch 'stable/for-linus-3.8' into linux-next

* 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
arch/x86/kernel/entry_32.S diff1 | diff2 | blob | history
arch/x86/xen/smp.c diff1 | diff2 | blob | history
drivers/xen/grant-table.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules