diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 00:09:06 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 00:09:06 +0400 |
| commit | baa6f8209312f9734434b89c12497774eea1cbe1 (patch) | |
| tree | 9cddd941d7cb829c2baf2df6980e2410e866d604 /include/uapi | |
| parent | 76f7a102c0290d3e24703b6cd3716d5a594d6173 (diff) | |
| parent | 06df44ee41442d83be061c5fd1b1de4f5fc6fbbf (diff) | |
| parent | b3087e48ce20be784fae1dbabc2e42e2ad0f21bc (diff) | |
| download | linux-baa6f8209312f9734434b89c12497774eea1cbe1.tar.xz | |
Merge tags 'modules-next-for-linus' and 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull trivial module and virtio fixes from Rusty Russell.
Apparently these were meant for 3.10, but came in after the release.
* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
modpost.c: Add .text.unlikely to TEXT_SECTIONS
* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
virtio: remove virtqueue_add_buf().
lguest: rename i386_head.S
virtio_blk: Add missing 'static' qualifiers
virtio: console: Add emergency writeonly register to config space
virtio_pci: better macro exported in uapi