]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/for-linus-3.6' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 23 Aug 2012 14:24:11 +0000 (10:24 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 23 Aug 2012 14:24:11 +0000 (10:24 -0400)
* stable/for-linus-3.6:
  xen/setup: Fix one-off error when adding for-balloon PFNs to the P2M.


Trivial merge