]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 181232c 4488096)
Merge branch 'stable/pvh.v7' into stable/for-linus-3.9
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 13 Feb 2013 15:23:43 +0000 (10:23 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 13 Feb 2013 15:23:43 +0000 (10:23 -0500)
commit46d362eff6fd29fd6fa6a0ae31accbb309c034bd
tree4325f0468d31fee93a98461726965caea7103290tree | snapshot
parent181232c249f0f910aec95af5effceb4fe640265ecommit | diff
parent4488096bd51f2559263dfb097c968a6864036eeacommit | diff
Merge branch 'stable/pvh.v7' into stable/for-linus-3.9

* stable/pvh.v7:
  xen/pvh: Use ballooning to allocate grant table pages [v2]
  Revert "xen/pvh linux: Use ballooning to allocate grant table pages"
  xen/pvh linux: Use ballooning to allocate grant table pages
  xen/pvh: remove code to map iomem from guest

Conflicts:
drivers/xen/grant-table.c
arch/x86/xen/mmu.c diff1 | diff2 | blob | history
drivers/xen/grant-table.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules