tree 6e3140bdca215b1b5a74a8856458e753186979fb
parent 67d2433ee7aa631bc3ab14c2af6bbc1d44d13a00
parent 69e8f430e243d657c2053f097efebc2e2cd559f0
author Linus Torvalds <torvalds@linux-foundation.org> 1327803333 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1327803333 -0800

Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* '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