tree b4bb52cf16203b78f1a102567915911f0d1c4b85
parent a1d3f5b70d13b7035f925de1f2ba0003a04b9ac5
parent 8e1b4cf2108488ccfb9a3e7ed7cd85a435e01d4b
author Linus Torvalds <torvalds@linux-foundation.org> 1295645710 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1295645710 -0800

Merge branch 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: p2m: correctly initialize partial p2m leaf
  xen: fix non-ANSI function warning in irq.c