From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 13 Dec 2013 19:59:50 +0000 (-0500)
Subject: Merge branch 'stable/for-linus-3.13' into linux-next
X-Git-Tag: next-20131220~24^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=85be9741104f96bb5b5224319ee00b3a362f6110;p=karo-tx-linux.git

Merge branch 'stable/for-linus-3.13' into linux-next

* stable/for-linus-3.13:
  xen/balloon: Seperate the auto-translate logic properly (v2)
  xen/block: Correctly define structures in public headers on ARM32 and ARM64
---

85be9741104f96bb5b5224319ee00b3a362f6110