Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kerne...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Jan 2012 02:15:33 +0000 (18:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Jan 2012 02:15:33 +0000 (18:15 -0800)
* 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/granttable: Disable grant v2 for HVM domains.
  x86: xen: size struct xen_spinlock to always fit in arch_spinlock_t


Trivial merge