]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/for-linus-3.12' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 25 Sep 2013 15:08:50 +0000 (11:08 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 25 Sep 2013 15:08:50 +0000 (11:08 -0400)
* stable/for-linus-3.12:
  xen/spinlock: Document the xen_nopvspin parameter.
  xen/p2m: check MFN is in range before using the m2p table


Trivial merge