]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/for-linus-3.13' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 13 Dec 2013 19:59:50 +0000 (14:59 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 13 Dec 2013 19:59:50 +0000 (14:59 -0500)
* 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


Trivial merge