Merge branch 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Aug 2010 15:40:31 +0000 (08:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Aug 2010 15:40:31 +0000 (08:40 -0700)
commite09b4e9a8d15dce04bedf1b860abeec00de31aad
tree8d103be84e6268a847affc3de46c42fd7bffe0b7
parent871eae4891a844e1fd065467b940f98dbf7aad1c
parentdffe2e1e1a1ddb566a76266136c312801c66dcf7
Merge branch 'upstream/core' of git://git./linux/kernel/git/jeremy/xen

* 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen: handle events as edge-triggered
  xen: use percpu interrupts for IPIs and VIRQs