diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-21 00:16:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-21 00:16:15 +0200 |
| commit | d45004f9947e521fc9e812bc7937ed6e0328793b (patch) | |
| tree | c376a9b0d4e767652b98e880674fcda29bed5f6a /arch/arm/mach-shmobile/clock-r8a73a4.c | |
| parent | CacheFiles: Don't try to dump the index key if the cookie has been cleared (diff) | |
| parent | vhost-scsi: whitespace tweak (diff) | |
| download | linux-d45004f9947e521fc9e812bc7937ed6e0328793b.tar.xz linux-d45004f9947e521fc9e812bc7937ed6e0328793b.zip | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull vhost updates from Michael Tsirkin:
"vhost: minor changes on top of 3.12-rc1
This fixes module loading for vhost-scsi, and tweaks locking in vhost
core a bit. Both of these are not exactly release blockers but it's
early in the cycle so I think it's a good idea to apply them now"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
vhost-scsi: whitespace tweak
vhost/scsi: use vmalloc for order-10 allocation
vhost: wake up worker outside spin_lock
Diffstat (limited to 'arch/arm/mach-shmobile/clock-r8a73a4.c')
0 files changed, 0 insertions, 0 deletions