Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Mar 2010 17:03:51 +0000 (10:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Mar 2010 17:03:51 +0000 (10:03 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio: console: Check if port is valid in resize_console
  virtio: console: Generate a kobject CHANGE event on adding 'name' attribute


Trivial merge