diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-02 08:20:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-02 08:20:04 -0700 |
| commit | 02cdf0827b61d51f0e9cc1b5ddd486950830ba08 (patch) | |
| tree | a7e52e9f102782ccb52d72f5ca425f77fedce709 /drivers/char/rocket.c | |
| parent | 8bec4a5d9305c86d028a519b08f05b81cd63cc55 (diff) | |
| parent | a007a751d98fe97142e4724a83a4e31ec66b7532 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
lguest: make Launcher see device status updates
lguest: remove bogus NULL cpu check
lguest: avoid using NR_CPUS as a bounds check.
virtio: add virtio disk geometry feature
virtio: explicit advertisement of driver features
virtio: change config to guest endian.
virtio: finer-grained features for virtio_net
virtio: wean net driver off NETDEV_TX_BUSY
virtio-blk: fix remove oops
virtio: fix scatterlist sizing in net driver.
virtio: de-structify virtio_block status byte
virtio: export more headers to userspace
virtio: fix sparse return void-valued expression warnings
virtio: fix tx_ stats in virtio_net
virtio: ignore corrupted virtqueues rather than spinning.
Diffstat (limited to 'drivers/char/rocket.c')
0 files changed, 0 insertions, 0 deletions