From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 31 Jan 2011 22:05:19 +0000 (+1000)
Subject: Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v2.6.38-rc3~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abfa44b5fd4a2f5d7549005bec465d4823a263ff;p=pandora-kernel.git

Merge branch 'tty-linus' of git://git./linux/kernel/git/gregkh/tty-2.6

* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  tty/serial: fix apbuart build
  n_hdlc: fix read and write locking
  serial: unbreak billionton CF card
  tty: use for_each_console() and WARN() on sysfs failures
  vt: fix issue when fbcon wants to takeover a second time.

Fix up trivial conflict in drivers/tty/tty_io.c
---

abfa44b5fd4a2f5d7549005bec465d4823a263ff
Reading git-diff-tree failed