From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 29 May 2012 18:25:53 +0000 (-0400)
Subject: Merge branch 'stable/for-linus-3.5.rebased' into uek2-merge
X-Git-Tag: v2.6.39-400.9.0~543^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6df81b618fcf62dbea134ff3db37f2977ce88a41;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'stable/for-linus-3.5.rebased' into uek2-merge

* stable/for-linus-3.5.rebased:
  xen/blkback: Copy id field when doing BLKIF_DISCARD.
  xen/balloon: Subtract from xen_released_pages the count that is populated.
---

6df81b618fcf62dbea134ff3db37f2977ce88a41