diff options
author | 2010-06-27 07:49:45 -0700 | |
---|---|---|
committer | 2010-06-27 07:49:45 -0700 | |
commit | a7b917256d8afacadc614414c4b0d411f76f3747 (patch) | |
tree | 295558a19f52e4c507da57204cc6a86ba22708c6 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 (diff) | |
parent | virtio-pci: disable msi at startup (diff) | |
download | linux-dev-a7b917256d8afacadc614414c4b0d411f76f3747.tar.xz linux-dev-a7b917256d8afacadc614414c4b0d411f76f3747.zip |
Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6
* 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6:
virtio-pci: disable msi at startup
virtio: return ENOMEM on out of memory
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions