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)
commit136d9ebff300044865693a57d68fe5905635992a
tree1a336de0e43c499c8b51475cca3afb52b8d1499d
parent149bb2fab547253e6359e76f1b86b95247110e68
parenta50777c791031d7345ce95785ea6220f67339d90
Merge branch 'xen-tmem-selfballoon-v8' of git://git./linux/kernel/git/djm/tmem into stable/drivers

* 'xen-tmem-selfballoon-v8' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem:
  xen: tmem: self-ballooning and frontswap-selfshrinking
drivers/xen/Kconfig
drivers/xen/Makefile