| commit | 964fe080d94db82a3268443e9b9ece4c60246414 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 23 07:35:16 2009 +0900 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 23 07:35:16 2009 +0900 |
| tree | d0095a9befb34f77bf32757e7465e5d2cbc40a93 | |
| parent | 4848490c50c5d46d4e9749fddc374c303823bcc4 [diff] | |
| parent | ff07eb897a97640b7ac0262cd50311ad403038f8 [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: move virtrng_remove to .devexit.text move virtballoon_remove to .devexit.text virtio_blk: Revert serial number support virtio: let header files include virtio_ids.h virtio_blk: revert QUEUE_FLAG_VIRT addition