From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 3 Feb 2012 21:09:05 +0000 (-0500)
Subject: Merge branch 'stable/for-linus-fixes-3.3' into linux-next
X-Git-Tag: next-20120402~14^2~11
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=818d281eb4c0740c0ee2a308d937ecfd8d1f9dd5;p=karo-tx-linux.git

Merge branch 'stable/for-linus-fixes-3.3' into linux-next

* stable/for-linus-fixes-3.3:
  xenbus_dev: add missing error check to watch handling
  xen/pci[front|back]: Use %d instead of %1x for displaying PCI devfn.
  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
---

818d281eb4c0740c0ee2a308d937ecfd8d1f9dd5