]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branches 'stable/pci.fixes-3.2' and 'stable/e820-3.2.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 15 Dec 2011 21:25:32 +0000 (16:25 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 15 Dec 2011 21:25:32 +0000 (16:25 -0500)
commitd3ffa915ab7ac4517b0266c908648f7c30305663
tree127acb91afba9ec21685130504b1cd67be3ee43f
parentaa24dbafaddd98666b0c6091976215b36b57fdcd
parent8743335eaec881d704b2ca08491686db2a932f77
parentffdc1778ac2176894533429b42a33bc59fd87ca1
Merge branches 'stable/pci.fixes-3.2' and 'stable/e820-3.2.rebased' into uek2-merge

* stable/pci.fixes-3.2:
  xen/swiotlb: Use page alignment for early buffer allocation.

* stable/e820-3.2.rebased:
  xen: only limit memory map to maximum reservation for domain 0.

Conflicts:
arch/x86/xen/setup.c