Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Jun 2010 22:45:06 +0000 (15:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Jun 2010 22:45:06 +0000 (15:45 -0700)
commit59e7648644d114094525081c3614acefffae8de4
tree6de8404f55b9655841ede013ca1c46f6c14c1ab5
parentc01ec7b1ea61b1c7febfe09d7751a4d916194aaf
parent8cd774ad30c22b9d89823f1f05d845f4cdaba9e8
Merge git://git./linux/kernel/git/gregkh/tty-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  serial: cpm_uart: implement the cpm_uart_early_write() function for console poll