]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'stable/drivers.bugfixes-3.2' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 29 Sep 2011 14:53:20 +0000 (10:53 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 29 Sep 2011 14:53:20 +0000 (10:53 -0400)
commit5f6fe1ead0b3b1ae9ed86b1b3c0f7aa2fe3a594e
tree4a0b2f932ba6c715b04aa8f8a9f3b441f30b6d80
parent5e06dd551432a6da4b738100664955c119b47a55
parent5fbdc10395cd500d6ff844825a918c4e6f38de37
Merge branch 'stable/drivers.bugfixes-3.2' into linux-next

* stable/drivers.bugfixes-3.2:
  xen: remove XEN_PLATFORM_PCI config option
  xen: XEN_PVHVM depends on PCI
  xen/pciback: double lock typo
arch/x86/xen/Kconfig