]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c069626 385c899)
Merge branch 'stable/bug.fixes-3.3.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 15 Feb 2012 15:48:39 +0000 (10:48 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 15 Feb 2012 15:48:39 +0000 (10:48 -0500)
* stable/bug.fixes-3.3.rebased:
  xen pvhvm: do not remap pirqs onto evtchns if !xen_have_vector_callback
  xen/smp: Fix CPU online/offline bug triggering a BUG: scheduling while atomic.
  xen/bootup: During bootup suppress XENBUS: Unable to read cpu state

1  2 
arch/x86/pci/xen.c patch | diff1 | diff2 | blob | history
arch/x86/xen/smp.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/pci/xen.c
Simple merge
diff --cc arch/x86/xen/smp.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.