From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Apr 2010 01:49:20 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
X-Git-Tag: firefly_0821_release~9833^2~2382
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f5284e7635787224dda1a2bf82a4c56b1c75671f;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/rusty/linux-2.6-for-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  hvc_console: Fix race between hvc_close and hvc_remove
  virtio: disable multiport console support.
  virtio: console makes incorrect assumption about virtio API
  virtio: console: Fix early_put_chars usage
  MAINTAINERS: Put the virtio-console entry in correct alphabetical order
---

f5284e7635787224dda1a2bf82a4c56b1c75671f