From: Konrad Rzeszutek Wilk Date: Tue, 21 Jun 2011 13:25:36 +0000 (-0400) Subject: Merge branch 'stable/frontswap-tmemonly' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v3.1-rc1~318^2~6 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=03dc6107ff485995d356cb8a77766920e2eee21e;p=users%2Fjedix%2Flinux-maple.git Merge branch 'stable/frontswap-tmemonly' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem into stable/drivers * 'stable/frontswap-tmemonly' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem: xen: prepare tmem shim to handle frontswap --- 03dc6107ff485995d356cb8a77766920e2eee21e