diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-23 00:35:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-23 00:35:16 +0200 |
| commit | 964fe080d94db82a3268443e9b9ece4c60246414 (patch) | |
| tree | d0095a9befb34f77bf32757e7465e5d2cbc40a93 /fs/proc/array.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | move virtrng_remove to .devexit.text (diff) | |
| download | linux-964fe080d94db82a3268443e9b9ece4c60246414.tar.xz linux-964fe080d94db82a3268443e9b9ece4c60246414.zip | |
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
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions