]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'stable/mmu.fixes' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 29 Sep 2011 14:54:54 +0000 (10:54 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 29 Sep 2011 14:54:54 +0000 (10:54 -0400)
commit4851367ca6a1ca0d709bd41174d65823cfa90250
treec487e911d5a3eb5da594ebf8bbdf055e57c1b330
parent5f6fe1ead0b3b1ae9ed86b1b3c0f7aa2fe3a594e
parent0930bba674e248b921ea659b036ff02564e5a5f4
Merge branch 'stable/mmu.fixes' into linux-next

* stable/mmu.fixes:
  xen: modify kernel mappings corresponding to granted pages
  xen: add an "highmem" parameter to alloc_xenballooned_pages

Conflicts:
drivers/xen/balloon.c
arch/x86/include/asm/xen/page.h
drivers/block/xen-blkback/blkback.c
drivers/xen/balloon.c
drivers/xen/gntdev.c
drivers/xen/grant-table.c