Merge branch 'xen-tmem-selfballoon-v8' of git://git.kernel.org/pub/scm/linux/kernel...
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 8 Jul 2011 19:07:30 +0000 (15:07 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 8 Jul 2011 19:07:30 +0000 (15:07 -0400)
* 'xen-tmem-selfballoon-v8' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem:
  xen: tmem: self-ballooning and frontswap-selfshrinking

1  2 
drivers/xen/Kconfig
drivers/xen/Makefile

Simple merge
Simple merge