diff options
| author | Linus Torvalds <[email protected]> | 2010-08-25 15:40:31 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-08-25 15:40:31 +0000 |
| commit | e09b4e9a8d15dce04bedf1b860abeec00de31aad (patch) | |
| tree | 8d103be84e6268a847affc3de46c42fd7bffe0b7 /net/unix/af_unix.c | |
| parent | Merge branch '2.6.36-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | xen: handle events as edge-triggered (diff) | |
| download | kernel-e09b4e9a8d15dce04bedf1b860abeec00de31aad.tar.gz kernel-e09b4e9a8d15dce04bedf1b860abeec00de31aad.zip | |
Merge branch 'upstream/core' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions