diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 13:49:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 13:49:37 -0700 |
| commit | 552c7dbb3459c219e44a65fd6bca21b1227c0e33 (patch) | |
| tree | 686c62c2821e687c73754c29145bca4e55f45224 /tools/perf/util/trace-event-scripting.c | |
| parent | Merge branch 'upstream/xen' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen (diff) | |
| parent | virtio_blk: Remove VBID ioctl (diff) | |
| download | linux-dev-552c7dbb3459c219e44a65fd6bca21b1227c0e33.tar.xz linux-dev-552c7dbb3459c219e44a65fd6bca21b1227c0e33.zip | |
Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
virtio_blk: Remove VBID ioctl
virtio_blk: Add 'serial' attribute to virtio-blk devices (v2)
virtio_blk: support barriers without FLUSH feature
Diffstat (limited to 'tools/perf/util/trace-event-scripting.c')
0 files changed, 0 insertions, 0 deletions