tree 885730ccc2e890368e9012869e54538182fda8f7
parent 3eac4abaa69949af0e2f64e5c55ee8a22bbdd3e7
parent 320718ee074acce5ffced6506cb51af1388942aa
author Linus Torvalds <torvalds@linux-foundation.org> 1270691360 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1270691360 -0700

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:
  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