Merge branch 'stable/frontswap-tmemonly' of git://git.kernel.org/pub/scm/linux/kernel...
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 21 Jun 2011 13:25:36 +0000 (09:25 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 21 Jun 2011 13:25:36 +0000 (09:25 -0400)
* 'stable/frontswap-tmemonly' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem:
  xen: prepare tmem shim to handle frontswap


Trivial merge